stdenv: delete the NIX_COREFOUNDATION_RPATH sledgehammer

pkgs/build-support/bintools-wrapper/ld-wrapper.sh

@@ -224,12 +224,6 @@ if [[ "$NIX_DONT_SET_RPATH_@suffixSalt@" != 1 && "$linkType" != static-pie ]]; t
 
 fi
 
-# This is outside the DONT_SET_RPATH branch because it's more targeted and we
-# usually want it (on Darwin) even if DONT_SET_RPATH is set.
-if [ -n "${NIX_COREFOUNDATION_RPATH:-}" ]; then
-  extraAfter+=(-rpath $NIX_COREFOUNDATION_RPATH)
-fi
-
 # Only add --build-id if this is a final link. FIXME: should build gcc
 # with --enable-linker-build-id instead?
 #

pkgs/development/libraries/glibc/default.nix

@@ -40,9 +40,6 @@ in
 
       # Apparently --bindir is not respected.
       makeFlagsArray+=("bindir=$bin/bin" "sbindir=$bin/sbin" "rootsbindir=$bin/sbin")
-    '' + lib.optionalString stdenv.buildPlatform.isDarwin ''
-      # ld-wrapper will otherwise attempt to inject CoreFoundation into ld-linux's RUNPATH
-      export NIX_COREFOUNDATION_RPATH=
     '';
 
     # The pie, stackprotector and fortify hardening flags are autodetected by

pkgs/os-specific/darwin/apple-sdk/framework-setup-hook.sh

@@ -29,14 +29,3 @@ fixDarwinFrameworksIn() {
     local dir="$1"
     fixDarwinFrameworks $(find "$dir" -name "*.dylib")
 }
-
-
-# This configures the stdenv to use /System/Library/Frameworks/CoreFoundation.framework
-# instead of the nix version by including the system frameworks path
-# as an rpath entry when creating binaries.
-
-useSystemCoreFoundationFramework () {
-  export NIX_COREFOUNDATION_RPATH=/System/Library/Frameworks
-}
-
-addEnvHooks "$hostOffset" useSystemCoreFoundationFramework

pkgs/stdenv/darwin/default.nix

@@ -681,7 +681,6 @@ rec {
       targetPlatform = localSystem;
 
       preHook = commonPreHook + ''
-        export NIX_COREFOUNDATION_RPATH=${pkgs.darwin.CF}/Library/Frameworks
         export PATH_LOCALE=${pkgs.darwin.locale}/share/locale
       '';