diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index 45d87a6d1f83..fab385c9a50c 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -141,16 +141,7 @@ rec { (mkDerivationSuper args).overrideAttrs (prevAttrs: { NIX_CFLAGS_LINK = toString (prevAttrs.NIX_CFLAGS_LINK or "") + lib.optionalString (stdenv.cc.isGNU or false) " -static-libgcc"; - nativeBuildInputs = (prevAttrs.nativeBuildInputs or []) - ++ lib.optionals stdenv.hasCC [ - (pkgs.buildPackages.makeSetupHook { - name = "darwin-portable-libSystem-hook"; - substitutions = { - libsystem = "${stdenv.cc.libc}/lib/libSystem.B.dylib"; - targetPrefix = stdenv.cc.bintools.targetPrefix; - }; - } ./darwin/portable-libsystem.sh) - ]; + nativeBuildInputs = (prevAttrs.nativeBuildInputs or []); })); }); diff --git a/pkgs/stdenv/darwin/portable-libsystem.sh b/pkgs/stdenv/darwin/portable-libsystem.sh deleted file mode 100644 index 7608c0a0de26..000000000000 --- a/pkgs/stdenv/darwin/portable-libsystem.sh +++ /dev/null @@ -1,12 +0,0 @@ -# Make /nix/store/...-libSystem “portable” for static built binaries. -# This just rewrites everything in $1/bin to use the -# /usr/lib/libSystem.B.dylib that is provided on every macOS system. - -fixupOutputHooks+=('fixLibsystemRefs $prefix') - -fixLibsystemRefs() { - if [ -d "$1/bin" ]; then - find "$1/bin" -type f -exec \ - @targetPrefix@install_name_tool -change @libsystem@ /usr/lib/libSystem.B.dylib {} \; - fi -}