lix-project/lix
20
57
Fork 31
Code Issues 347 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Process nix.conf options in "new" nix commands, add test.

Browse source 
Without this (minor) change, the options set using "--option"
or read from nix.conf were parsed but not used.
This commit is contained in:
Will Dietz 2017-04-05 07:34:10 -05:00
parent d8ff3aaae7
commit 30f89e0d65
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/nix/main.cc
View file

@ -42,6 +42,7 @@ void mainWrapped(int argc, char * * argv)
NixArgs args; NixArgs args;
args.parseCmdline(argvToStrings(argc, argv)); args.parseCmdline(argvToStrings(argc, argv));
settings.update();
assert(args.command); assert(args.command);

5
tests/timeout.sh
View file

@ -29,3 +29,8 @@ if nix-build timeout.nix -A closeLog; then
echo "build should have failed" echo "build should have failed"
exit 1 exit 1
fi fi
if nix build -f timeout.nix silent --option build-max-silent-time 2; then
echo "build should have failed"
exit 1
fi