about summary refs log tree commit diff
path: root/src/nix/main.cc
diff options
context:
space:
mode:
authorWill Dietz <w@wdtz.org>2017-04-05T12·34-0500
committerWill Dietz <w@wdtz.org>2017-04-08T17·59-0500
commit30f89e0d6564394747e20e04d486b81aeec96752 (patch)
tree67a555751e87ffb0e3b30dda1dc825a7a89c7a92 /src/nix/main.cc
parentd8ff3aaae7167e22d0c0f4f55ac9da8fb6655f1f (diff)
Process nix.conf options in "new" nix commands, add test.
Without this (minor) change, the options set using "--option"
or read from nix.conf were parsed but not used.
Diffstat (limited to 'src/nix/main.cc')
-rw-r--r--src/nix/main.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/nix/main.cc b/src/nix/main.cc
index 440ced97dfcc..fdb8f6e3a197 100644
--- a/src/nix/main.cc
+++ b/src/nix/main.cc
@@ -42,6 +42,7 @@ void mainWrapped(int argc, char * * argv)
     NixArgs args;
 
     args.parseCmdline(argvToStrings(argc, argv));
+    settings.update();
 
     assert(args.command);