diff options
author | Florian Klink <flokli@flokli.de> | 2021-01-02 12:04:43 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-02 12:04:43 +0100 |
commit | 71e24364c9773d2d4058ad3b488d618603b80023 (patch) | |
tree | 7d4cfe5f12d30d04ba68c43f1b9230543948742d /nixos | |
parent | da3ee10b6b84bc9985f082f660f84ec2d6376671 (diff) | |
parent | e4cd9a8f043cb6f10f56da4bc08896cd22b0a10f (diff) |
Merge pull request #108184 from lovesegfault/command-not-found-nix-shell
nixos/command-not-found: don't suggest nix-env
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/modules/programs/command-not-found/command-not-found.pl | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/nixos/modules/programs/command-not-found/command-not-found.pl b/nixos/modules/programs/command-not-found/command-not-found.pl index ab7aa204653c..63c4925d4333 100644 --- a/nixos/modules/programs/command-not-found/command-not-found.pl +++ b/nixos/modules/programs/command-not-found/command-not-found.pl @@ -27,8 +27,8 @@ if (!defined $res || scalar @$res == 0) { my $package = @$res[0]->{package}; if ($ENV{"NIX_AUTO_INSTALL"} // "") { print STDERR <<EOF; -The program ‘$program’ is currently not installed. It is provided by -the package ‘$package’, which I will now install for you. +The program '$program' is currently not installed. It is provided by +the package '$package', which I will now install for you. EOF ; exit 126 if system("nix-env", "-iA", "nixos.$package") == 0; @@ -36,16 +36,17 @@ EOF exec("nix-shell", "-p", $package, "--run", shell_quote("exec", @ARGV)); } else { print STDERR <<EOF; -The program ‘$program’ is currently not installed. You can install it by typing: - nix-env -iA nixos.$package +The program '$program' is not in your PATH. You can make it available in a +ephemeral shell by typing: + nix-shell -p $package EOF } } else { print STDERR <<EOF; -The program ‘$program’ is currently not installed. It is provided by -several packages. You can install it by typing one of the following: +The program '$program' is not in your PATH. It is provided by several packages. +You can make it available in a ephemeral shell by typing one of the following: EOF - print STDERR " nix-env -iA nixos.$_->{package}\n" foreach @$res; + print STDERR " nix-shell -p $_->{package}\n" foreach @$res; } exit 127; |