From 80748a6ce4444826c0fa3deb3c23aab7d88563eb Mon Sep 17 00:00:00 2001 From: sempiternal-aurora <78790545+sempiternal-aurora@users.noreply.github.com> Date: Tue, 30 Jun 2026 22:34:13 +1000 Subject: [PATCH] tk: fix build on darwin --- pkgs/development/libraries/tk/generic.nix | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/tk/generic.nix b/pkgs/development/libraries/tk/generic.nix index 65270be3e345..7088a60468cc 100644 --- a/pkgs/development/libraries/tk/generic.nix +++ b/pkgs/development/libraries/tk/generic.nix @@ -9,6 +9,8 @@ zlib, patches ? [ ], enableAqua ? stdenv.hostPlatform.isDarwin, + # TODO: Clean up on `staging`. + llvmPackages, ... }: @@ -74,6 +76,10 @@ tcl.mkTclDerivation { ++ lib.optionals (lib.versionAtLeast tcl.version "9.0") [ # Only used to detect the presence of zlib. Could be replaced with a stub. zip + ] + # TODO: Clean up on `staging`. + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + llvmPackages.lld ]; buildInputs = lib.optionals (lib.versionAtLeast tcl.version "9.0") [ zlib @@ -89,9 +95,16 @@ tcl.mkTclDerivation { inherit tcl; - env = lib.optionalAttrs (lib.versionOlder tcl.version "8.6") { - NIX_CFLAGS_COMPILE = "-std=gnu17"; - }; + env = + lib.optionalAttrs (lib.versionOlder tcl.version "8.6") { + NIX_CFLAGS_COMPILE = "-std=gnu17"; + } + // lib.optionalAttrs stdenv.hostPlatform.isDarwin { + # workaround for ld64 hardening issue + # + # TODO: Clean up on `staging` + NIX_CFLAGS_COMPILE = "-fuse-ld=lld"; + }; passthru = rec { inherit (tcl) release version;