JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "utils.bash: also "fix" cc-wrapper and pkg-config-wrapper"

Browse Source 
Follow up to the revert in e560459c5b.

This reverts commit 1936b11f63.
This commit is contained in:
Frederik Rietdijk 2020-09-07 16:31:59 +02:00
parent be61518b91
commit 5ceea5705a
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/build-support/cc-wrapper/default.nix
View File

@ -453,7 +453,7 @@ stdenv.mkDerivation {
substituteAll ${./add-flags.sh} $out/nix-support/add-flags.sh
substituteAll ${./add-hardening.sh} $out/nix-support/add-hardening.sh
substituteAll ${if stdenv.isDarwin then ../wrapper-common/utils.bash.darwin else ../wrapper-common/utils.bash} $out/nix-support/utils.bash
substituteAll ${../wrapper-common/utils.bash} $out/nix-support/utils.bash
''
##

2
pkgs/build-support/pkg-config-wrapper/default.nix
View File

@ -107,7 +107,7 @@ stdenv.mkDerivation {
+ ''
substituteAll ${./add-flags.sh} $out/nix-support/add-flags.sh
substituteAll ${if stdenv.isDarwin then ../wrapper-common/utils.bash.darwin else ../wrapper-common/utils.bash} $out/nix-support/utils.bash
substituteAll ${../wrapper-common/utils.bash} $out/nix-support/utils.bash
''
##