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

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

Browse Source 
Revert the hack and the original faulty commit.

This reverts commit 48264ee506105a2f5e61e5d327599e9f301bd77f.

Revert "Purity checking should accept $TMP and not just /tmp"

This reverts commit fb777be7d2.
This commit is contained in:
Frederik Rietdijk
2020-09-06 18:16:14 +02:00
parent 1d881848f8
commit e560459c5b
3 changed files with 4 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/build-support/bintools-wrapper/default.nix
+1 -1
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 ${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
''
##