diff options
| author | Sandro Jäckel <sandro.jaeckel@gmail.com> | 2022-02-20 16:27:24 +0100 |
|---|---|---|
| committer | Sandro Jäckel <sandro.jaeckel@gmail.com> | 2022-02-20 16:27:24 +0100 |
| commit | b7da6c7da765bb07fbcd3366d29d89c56cf25e97 (patch) | |
| tree | 6e78bda4ed4e2d8a57275a9237acb0b5082d8bbe /pkgs/stdenv | |
| parent | 1c772b4772893cbd77019f3fb63af220bd5bb4ef (diff) | |
| download | nixpkgs-b7da6c7da765bb07fbcd3366d29d89c56cf25e97.tar nixpkgs-b7da6c7da765bb07fbcd3366d29d89c56cf25e97.tar.gz nixpkgs-b7da6c7da765bb07fbcd3366d29d89c56cf25e97.tar.bz2 nixpkgs-b7da6c7da765bb07fbcd3366d29d89c56cf25e97.tar.lz nixpkgs-b7da6c7da765bb07fbcd3366d29d89c56cf25e97.tar.xz nixpkgs-b7da6c7da765bb07fbcd3366d29d89c56cf25e97.tar.zst nixpkgs-b7da6c7da765bb07fbcd3366d29d89c56cf25e97.zip | |
stdenv, dep-licenses.sh: do not skip handling of other exit traps
See https://github.com/akinomyoga/ble.sh/issues/179
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/generic/setup.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 0777fa830c1..350fff48252 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -143,14 +143,14 @@ exitHandler() { echo "build failed with exit code $exitCode (ignored)" mkdir -p "$out/nix-support" printf "%s" "$exitCode" > "$out/nix-support/failed" - exit 0 + return 0 fi else runHook exitHook fi - exit "$exitCode" + return "$exitCode" } trap "exitHandler" EXIT |