diff options
author | Eelco Dolstra <edolstra@gmail.com> | 2018-10-26T09·35+0200 |
---|---|---|
committer | Eelco Dolstra <edolstra@gmail.com> | 2018-10-26T10·54+0200 |
commit | f6a3dfe4e06980b2d060fd1a646cb5ca20f29779 (patch) | |
tree | 2b40b00a7283617f18e663e8cb10fda08a38fb93 /src/nix-env/nix-env.cc | |
parent | c47e14ee453f3054d4a7326d8efe9255458bd7fd (diff) |
Merge all nix-* binaries into nix
These are all symlinks to 'nix' now, reducing the installed size by about ~1.7 MiB.
Diffstat (limited to 'src/nix-env/nix-env.cc')
-rw-r--r-- | src/nix-env/nix-env.cc | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/nix-env/nix-env.cc b/src/nix-env/nix-env.cc index f9c8a8d313e7..56ed75daee44 100644 --- a/src/nix-env/nix-env.cc +++ b/src/nix-env/nix-env.cc @@ -13,6 +13,7 @@ #include "json.hh" #include "value-to-json.hh" #include "xml-writer.hh" +#include "legacy.hh" #include <cerrno> #include <ctime> @@ -1311,12 +1312,9 @@ static void opVersion(Globals & globals, Strings opFlags, Strings opArgs) } -int main(int argc, char * * argv) +static int _main(int argc, char * * argv) { - return handleExceptions(argv[0], [&]() { - initNix(); - initGC(); - + { Strings opFlags, opArgs; Operation op = 0; RepairFlag repair = NoRepair; @@ -1428,5 +1426,9 @@ int main(int argc, char * * argv) op(globals, opFlags, opArgs); globals.state->printStats(); - }); + + return 0; + } } + +static RegisterLegacyCommand s1("nix-env", _main); |