summary refs log tree commit diff
path: root/pkgs/stdenv
diff options
context:
space:
mode:
authorSandro Jäckel <sandro.jaeckel@gmail.com>2022-01-23 03:50:09 +0100
committerSandro Jäckel <sandro.jaeckel@gmail.com>2022-01-23 03:50:09 +0100
commit37fdba0b4f14b81ba483c33977a149ac1fdcc87b (patch)
treec7758056945b802a18a01afa5886ea2a88d83330 /pkgs/stdenv
parentf865a2ca8980106e646b06c98e0dd4a80d7bff25 (diff)
downloadnixpkgs-37fdba0b4f14b81ba483c33977a149ac1fdcc87b.tar
nixpkgs-37fdba0b4f14b81ba483c33977a149ac1fdcc87b.tar.gz
nixpkgs-37fdba0b4f14b81ba483c33977a149ac1fdcc87b.tar.bz2
nixpkgs-37fdba0b4f14b81ba483c33977a149ac1fdcc87b.tar.lz
nixpkgs-37fdba0b4f14b81ba483c33977a149ac1fdcc87b.tar.xz
nixpkgs-37fdba0b4f14b81ba483c33977a149ac1fdcc87b.tar.zst
nixpkgs-37fdba0b4f14b81ba483c33977a149ac1fdcc87b.zip
stdenv: restore bash options -e/-u to the values they where before
Source https://github.com/akinomyoga/ble.sh/issues/169#issuecomment-1019049032

Author: akinomyoga
Diffstat (limited to 'pkgs/stdenv')
-rw-r--r--pkgs/stdenv/generic/setup.sh7
1 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 2951813c0f7..563c07407ff 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -1,3 +1,4 @@
+__nixpkgs_setup_set_original=$-
 set -eu
 set -o pipefail
 shopt -s inherit_errexit
@@ -1361,5 +1362,7 @@ runHook userHook
 
 dumpVars
 
-# Disable nounset for nix-shell.
-set +u
+# Restore the original options for nix-shell
+[[ $__nixpkgs_setup_set_original == *e* ]] || set +e
+[[ $__nixpkgs_setup_set_original == *u* ]] || set +u
+unset -v __nixpkgs_setup_set_original