From d12a044b56cdfcad9ba633da9b4673ee24f91610 Mon Sep 17 00:00:00 2001 From: Emily Date: Sun, 28 Jun 2026 17:36:04 +0100 Subject: [PATCH] Revert "glib: use LLD on Darwin to work around ld64 hardening issue" The ld64 issue has been fixed. This reverts commit 5f08853644352cc04d2b75f967583e621d22bff6. --- pkgs/by-name/gl/glib/package.nix | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/pkgs/by-name/gl/glib/package.nix b/pkgs/by-name/gl/glib/package.nix index bda3d4a4a09c..4aa4d639df9e 100644 --- a/pkgs/by-name/gl/glib/package.nix +++ b/pkgs/by-name/gl/glib/package.nix @@ -24,8 +24,6 @@ gi-docgen, # use util-linuxMinimal to avoid circular dependency (util-linux, systemd, glib) util-linuxMinimal ? null, - # TODO: Clean up on `staging`. - llvmPackages, buildPackages, # this is just for tests (not in the closure of any regular package) @@ -209,10 +207,6 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals withDtrace [ systemtap' # for dtrace - ] - # TODO: Clean up on `staging`. - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - llvmPackages.lld ]; propagatedBuildInputs = [ @@ -256,13 +250,6 @@ stdenv.mkDerivation (finalAttrs: { "-DG_DISABLE_CAST_CHECKS" ]; DETERMINISTIC_BUILD = 1; - } - // lib.optionalAttrs stdenv.hostPlatform.isDarwin { - # Work around ld64 hardening issue. - # - # TODO: Clean up on `staging`. - CC_LD = "lld"; - OBJC_LD = "lld"; }; postPatch = ''