Fix nix-shell tests
The nix-shell fix in 668fef2e4f
revealed
that we had some --pure tests that incorrectly depended on PATH from
config.nix's mkDerivation being overwritten by the caller's PATH.
http://hydra.nixos.org/build/49242478
This commit is contained in:
parent
d3e1aad421
commit
89ffe1eff9
2 changed files with 2 additions and 0 deletions
|
@ -4,6 +4,7 @@ clearStore
|
|||
|
||||
# Test nix-shell -A
|
||||
export IMPURE_VAR=foo
|
||||
export NIX_BUILD_SHELL=$SHELL
|
||||
output=$(nix-shell --pure shell.nix -A shellDrv --run \
|
||||
'echo "$IMPURE_VAR - $VAR_FROM_STDENV_SETUP - $VAR_FROM_NIX"')
|
||||
|
||||
|
|
|
@ -34,6 +34,7 @@ rec {
|
|||
mkdir -p $out/bin
|
||||
echo 'echo foo' > $out/bin/foo
|
||||
chmod a+rx $out/bin/foo
|
||||
ln -s ${shell} $out/bin/bash
|
||||
'';
|
||||
|
||||
bar = runCommand "bar" {} ''
|
||||
|
|
Loading…
Reference in a new issue