diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2018-02-08T14·25+0100 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2018-02-08T14·25+0100 |
| commit | ad97a218344937d8586d0f4f710f3785da77f5bd (patch) | |
| tree | 2d1645a485979688b6cbb51b07733832e26c5982 | |
| parent | 444bae44ef3c27959d837d2e1f28131290cb52a7 (diff) | |
nix-env: Fix parsing of --system
https://hydra.nixos.org/build/68827814
| -rw-r--r-- | src/libmain/common-args.cc | 4 | ||||
| -rw-r--r-- | tests/user-envs.sh | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/libmain/common-args.cc b/src/libmain/common-args.cc index d3aac6aba1ff..bcc05c2cdad6 100644 --- a/src/libmain/common-args.cc +++ b/src/libmain/common-args.cc @@ -37,6 +37,10 @@ MixCommonArgs::MixCommonArgs(const string & programName) std::string cat = "config"; settings.convertToArgs(*this, cat); + + // Backward compatibility hack: nix-env already had a --system flag. + if (programName == "nix-env") longFlags.erase("system"); + hiddenCategories.insert(cat); } diff --git a/tests/user-envs.sh b/tests/user-envs.sh index c4192fdc59b2..ba63923113d8 100644 --- a/tests/user-envs.sh +++ b/tests/user-envs.sh @@ -24,6 +24,9 @@ rm -f $HOME/.nix-defexpr ln -s $(pwd)/user-envs.nix $HOME/.nix-defexpr nix-env -qa '*' --description | grep -q silly +# Query the system. +nix-env -qa '*' --system | grep -q $system + # Install "foo-1.0". nix-env -i foo-1.0 |