Revert "stdenv: set NIX_DONT_SET_RPATH_FOR_TARGET on Darwin" (#355667)

This commit is contained in:
Emily
2024-11-17 07:22:40 +00:00
committed by GitHub
+11 -3
View File
@@ -114,9 +114,17 @@ let
export NIX_NO_SELF_RPATH=1
'' + lib.optionalString (hostPlatform.isDarwin && hostPlatform.isMacOS) ''
export MACOSX_DEPLOYMENT_TARGET=${hostPlatform.darwinMinVersion}
'' + lib.optionalString targetPlatform.isDarwin ''
export NIX_DONT_SET_RPATH_FOR_TARGET=1
'';
''
# TODO this should be uncommented, but it causes stupid mass rebuilds due to
# `pkgsCross.*.buildPackages` not being the same, resulting in cross-compiling
# for a target rebuilding all of `nativeBuildInputs` for that target.
#
# I think the best solution would just be to fixup linux RPATHs so we don't
# need to set `-rpath` anywhere.
# + lib.optionalString targetPlatform.isDarwin ''
# export NIX_DONT_SET_RPATH_FOR_TARGET=1
# ''
;
inherit initialPath shell
defaultNativeBuildInputs defaultBuildInputs;