diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2019-10-29 19:44:44 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2019-11-01 14:44:43 -0400 |
| commit | 545e7518a808081261a6331c19ec9c5cffea4a81 (patch) | |
| tree | 55aa1204ac446039e7f75fef34affdc890bb1d09 /pkgs/build-support/bintools-wrapper | |
| parent | 43a98868ae1c202e6151e05e25f5d038c17cbd4e (diff) | |
| download | nixpkgs-545e7518a808081261a6331c19ec9c5cffea4a81.tar nixpkgs-545e7518a808081261a6331c19ec9c5cffea4a81.tar.gz nixpkgs-545e7518a808081261a6331c19ec9c5cffea4a81.tar.bz2 nixpkgs-545e7518a808081261a6331c19ec9c5cffea4a81.tar.lz nixpkgs-545e7518a808081261a6331c19ec9c5cffea4a81.tar.xz nixpkgs-545e7518a808081261a6331c19ec9c5cffea4a81.tar.zst nixpkgs-545e7518a808081261a6331c19ec9c5cffea4a81.zip | |
bintools-wrapper: Don't stop `set -u`-ing
Same justification as previous commit.
Diffstat (limited to 'pkgs/build-support/bintools-wrapper')
| -rw-r--r-- | pkgs/build-support/bintools-wrapper/default.nix | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index e02e77de45e..9f5395b635e 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -111,17 +111,13 @@ stdenv.mkDerivation { installPhase = '' - set -u - mkdir -p $out/bin $out/nix-support wrap() { local dst="$1" local wrapper="$2" export prog="$3" - set +u substituteAll "$wrapper" "$out/bin/$dst" - set -u chmod +x "$out/bin/$dst" } '' @@ -163,8 +159,6 @@ stdenv.mkDerivation { [[ -e "$underlying" ]] || continue wrap ${targetPrefix}$variant ${./ld-wrapper.sh} $underlying done - - set +u ''; emulation = let @@ -307,7 +301,6 @@ stdenv.mkDerivation { '' + '' - set +u 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 |