3
0
Fork 0
forked from mirrors/nixpkgs

root: fix environment setup

1) s/envHook/postHook/
2) patch to not set $p that fixes nested ```nix-shell -p root``` calls
This commit is contained in:
Dmitry Kalinkin 2016-10-29 14:47:32 -04:00
parent fa4167c0a1
commit 9434ec5441
No known key found for this signature in database
GPG key ID: 5157B3EC8B2CA333
3 changed files with 19 additions and 1 deletions

View file

@ -21,6 +21,9 @@ stdenv.mkDerivation rec {
sha256 = "186i7ni75yvjydy6lpmaplqxfb5z2019bgpbhff1n6zn2qlrff2r";
})
./sw_vers.patch
# this prevents thisroot.sh from setting $p, which interferes with stdenv setup
./thisroot.patch
];
preConfigure = ''

View file

@ -6,4 +6,4 @@ thisroot () {
source @out@/bin/thisroot.sh
}
envHooks+=(thisroot)
postHooks+=(thisroot)

View file

@ -0,0 +1,15 @@
diff --git a/config/thisroot.sh b/config/thisroot.sh
index 85dee20..532cb28 100644
--- a/config/thisroot.sh
+++ b/config/thisroot.sh
@@ -15,8 +15,8 @@ drop_from_path()
return 1
fi
- p=$1
- drop=$2
+ local p=$1
+ local drop=$2
newpath=`echo $p | sed -e "s;:${drop}:;:;g" \
-e "s;:${drop};;g" \