diff options
| -rw-r--r-- | pkgs/shells/fish/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index e69c033cf4045..adfe44b3bac1d 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, python27, which, groff, gettext, man_db, bc }: +{ stdenv, fetchurl, ncurses, python, which, groff, gettext, man_db, bc }: stdenv.mkDerivation rec { name = "fish-${version}"; @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses ]; # Required binaries during execution - # Python27: Autocompletion generated from manpages and config editing - propagatedBuildInputs = [ python27 which groff gettext man_db bc ]; + # Python: Autocompletion generated from manpages and config editing + propagatedBuildInputs = [ python which groff gettext man_db bc ]; postInstall = '' sed -i "s|bc|${bc}/bin/bc|" "$out/share/fish/functions/seq.fish" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 20e9d1db657ef..8cc1e36d8dd8d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2487,7 +2487,9 @@ let dash = callPackage ../shells/dash { }; - fish = callPackage ../shells/fish { }; + fish = callPackage ../shells/fish { + python = python27Full; + }; tcsh = callPackage ../shells/tcsh { }; |