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

utils.bash: revert #93560 for darwin, unblocks channels

Browse Source 
Temporary fix. We definitely do not want to have two separate
implementations.
This commit is contained in:
Frederik Rietdijk
2020-09-06 17:58:38 +02:00
committed by Frederik Rietdijk
parent b23940e514
commit 08eb704bc3
2 changed files with 93 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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