about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2017-04-12T09·03+0200
committerGitHub <noreply@github.com>2017-04-12T09·03+0200
commit23304f527a4754fc2a04c90acd05af6baf7f19cb (patch)
tree89fefd1f4ec49ed8f670347e5d222821ce0c2e37 /src
parentb134c2d05280be9615c81f018a5309fc8dcbca0e (diff)
parenta0c56197fcb6d13e77ccbdd28322a540352b880c (diff)
Merge pull request #1302 from dtzWill/fix/nix-options
Process nix.conf options in "new" commands, add test
Diffstat (limited to 'src')
-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);