diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-02-14T10·42+0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-02-14T10·42+0100 |
| commit | 61fd494d760d667649fa48665f9aa75ba88a1eb6 (patch) | |
| tree | 2ce091b595c70f47af9eb50007fdcdcc0b032808 /src/libmain/shared.cc | |
| parent | f9fc6acbf4eadd2d9018d3da14394fdfbddde5f6 (diff) | |
| parent | f67f52751f21b2fe70b5a7352053f130eb6f0f59 (diff) | |
Merge remote-tracking branch 'shlevy/ssh-substituter'
Diffstat (limited to 'src/libmain/shared.cc')
| -rw-r--r-- | src/libmain/shared.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/libmain/shared.cc b/src/libmain/shared.cc index fb70cb076732..30238c7fbe9a 100644 --- a/src/libmain/shared.cc +++ b/src/libmain/shared.cc @@ -223,6 +223,9 @@ static void initAndRun(int argc, char * * argv) else remaining.push_back(arg); } + if (char *pack = getenv("_NIX_OPTIONS")) + settings.unpack(pack); + settings.update(); run(remaining); |