diff options
| author | Theodore Ni <3806110+tjni@users.noreply.github.com> | 2023-08-04 10:14:20 -0700 |
|---|---|---|
| committer | Theodore Ni <3806110+tjni@users.noreply.github.com> | 2023-08-04 14:12:56 -0700 |
| commit | ca73fb024a757f3ddf1a32a2e88cc2bccb88479c (patch) | |
| tree | 0e59ad19fb3db4770244e030951ba9b46a58ac8e /pkgs/build-support/setup-hooks/make-binary-wrapper | |
| parent | 09f5e7d840154e63b710ece7c66a4d4a130b14d3 (diff) | |
| download | nixpkgs-ca73fb024a757f3ddf1a32a2e88cc2bccb88479c.tar nixpkgs-ca73fb024a757f3ddf1a32a2e88cc2bccb88479c.tar.gz nixpkgs-ca73fb024a757f3ddf1a32a2e88cc2bccb88479c.tar.bz2 nixpkgs-ca73fb024a757f3ddf1a32a2e88cc2bccb88479c.tar.lz nixpkgs-ca73fb024a757f3ddf1a32a2e88cc2bccb88479c.tar.xz nixpkgs-ca73fb024a757f3ddf1a32a2e88cc2bccb88479c.tar.zst nixpkgs-ca73fb024a757f3ddf1a32a2e88cc2bccb88479c.zip | |
makeBinaryWrapper: remove cc dependency on aarch64-darwin
Diffstat (limited to 'pkgs/build-support/setup-hooks/make-binary-wrapper')
| -rw-r--r-- | pkgs/build-support/setup-hooks/make-binary-wrapper/default.nix | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/pkgs/build-support/setup-hooks/make-binary-wrapper/default.nix b/pkgs/build-support/setup-hooks/make-binary-wrapper/default.nix index 17b97b1082e..62ba3705be2 100644 --- a/pkgs/build-support/setup-hooks/make-binary-wrapper/default.nix +++ b/pkgs/build-support/setup-hooks/make-binary-wrapper/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, targetPackages +{ targetPackages , lib , makeSetupHook , dieHook @@ -11,9 +10,7 @@ makeSetupHook { name = "make-binary-wrapper-hook"; - propagatedBuildInputs = [ dieHook ] - # https://github.com/NixOS/nixpkgs/issues/148189 - ++ lib.optional (stdenv.isDarwin && stdenv.isAarch64) cc; + propagatedBuildInputs = [ dieHook ]; substitutions = { cc = "${cc}/bin/${cc.targetPrefix}cc ${lib.escapeShellArgs (map (s: "-fsanitize=${s}") sanitizers)}"; |