From b3d3cfb2709632a68d8293fc71b014a1c1f7e5bf Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 15 Jul 2026 03:19:45 +0100 Subject: [PATCH] Revert "darktable: fix build on Darwin" The ld64 issue has been fixed. This reverts commit 3aad607343efb414fdf22fc1284c99c3f640ed3e. --- pkgs/by-name/da/darktable/package.nix | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/pkgs/by-name/da/darktable/package.nix b/pkgs/by-name/da/darktable/package.nix index d70fc071213a..c954ded2f1f6 100644 --- a/pkgs/by-name/da/darktable/package.nix +++ b/pkgs/by-name/da/darktable/package.nix @@ -103,8 +103,7 @@ stdenv.mkDerivation rec { pkg-config wrapGAppsHook3 saxon # Use Saxon instead of libxslt to fix XSLT generate-id() consistency issues - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ llvmPackages.lld ]; + ]; buildInputs = [ SDL2 @@ -185,12 +184,6 @@ stdenv.mkDerivation rec { "-DUSE_KWALLET=OFF" ]; - env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { - # Work around ld64's libc++ hardening issue. - # TODO: Remove once #536365 reaches this branch. - NIX_CFLAGS_LINK = "-fuse-ld=lld"; - }; - # darktable changed its rpath handling in commit # 83c70b876af6484506901e6b381304ae0d073d3c and as a result the # binaries can't find libdarktable.so, so change LD_LIBRARY_PATH in