diff options
| author | Jonathan Ringer <jonringer117@gmail.com> | 2019-11-27 22:57:50 -0800 |
|---|---|---|
| committer | Jonathan Ringer <jonringer117@gmail.com> | 2019-11-27 22:57:50 -0800 |
| commit | 0c1c18ca4416baa46c940960aa5e619873a2318e (patch) | |
| tree | 78d7fd3eb63e91fa99267e2d91a2a891ee29f567 /pkgs/applications/science/misc | |
| parent | 4cc592761db580855b47fb84776e68b1d936521c (diff) | |
| parent | f4f816902112778172565baf91c2483186027c3b (diff) | |
| download | nixlib-0c1c18ca4416baa46c940960aa5e619873a2318e.tar nixlib-0c1c18ca4416baa46c940960aa5e619873a2318e.tar.gz nixlib-0c1c18ca4416baa46c940960aa5e619873a2318e.tar.bz2 nixlib-0c1c18ca4416baa46c940960aa5e619873a2318e.tar.lz nixlib-0c1c18ca4416baa46c940960aa5e619873a2318e.tar.xz nixlib-0c1c18ca4416baa46c940960aa5e619873a2318e.tar.zst nixlib-0c1c18ca4416baa46c940960aa5e619873a2318e.zip | |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/applications/science/misc')
| -rw-r--r-- | pkgs/applications/science/misc/root/setup-hook.sh | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/applications/science/misc/root/setup-hook.sh b/pkgs/applications/science/misc/root/setup-hook.sh index fc2b697d8a82..b26cf9b779f8 100644 --- a/pkgs/applications/science/misc/root/setup-hook.sh +++ b/pkgs/applications/science/misc/root/setup-hook.sh @@ -1,9 +1,13 @@ thisroot () { # Workaround thisroot.sh dependency on man - if [ -z "${MANPATH}" ]; then + if [ -z "${MANPATH-}" ]; then MANPATH=: fi + local oldOpts="-u" + shopt -qo nounset || oldOpts="+u" + set +u source @out@/bin/thisroot.sh + set "$oldOpts" } postHooks+=(thisroot) |