alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #247164 from tjni/make-wrapper-dependencies

Browse source 
makeBinaryWrapper: remove cc dependency on aarch64-darwin
This commit is contained in:
Naïm Favier 2023-08-05 10:30:54 +02:00 committed by GitHub
parent 28d605b5b5 ca73fb024a
commit ec2efb7476
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkgs/build-support/setup-hooks/make-binary-wrapper/default.nix
View file

@ -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)}";