diff options
| author | Profpatsch <mail@profpatsch.de> | 2017-08-05 22:14:24 +0200 |
|---|---|---|
| committer | Profpatsch <mail@profpatsch.de> | 2017-08-05 22:14:24 +0200 |
| commit | b7290a283aec78fb3bc4d9e0124b16801bb506b6 (patch) | |
| tree | c6d703a64149ba2721370d9cde5370484df6110d /pkgs/shells/fish | |
| parent | c9d419a22bc42f79acfdf766b9d5908cf12ccdbc (diff) | |
| download | nixpkgs-b7290a283aec78fb3bc4d9e0124b16801bb506b6.tar nixpkgs-b7290a283aec78fb3bc4d9e0124b16801bb506b6.tar.gz nixpkgs-b7290a283aec78fb3bc4d9e0124b16801bb506b6.tar.bz2 nixpkgs-b7290a283aec78fb3bc4d9e0124b16801bb506b6.tar.lz nixpkgs-b7290a283aec78fb3bc4d9e0124b16801bb506b6.tar.xz nixpkgs-b7290a283aec78fb3bc4d9e0124b16801bb506b6.tar.zst nixpkgs-b7290a283aec78fb3bc4d9e0124b16801bb506b6.zip | |
fish: fix the fish_config tool
It requires a python interpreter to work.
Diffstat (limited to 'pkgs/shells/fish')
| -rw-r--r-- | pkgs/shells/fish/default.nix | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index c328329bb26..9da7e407e16 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, coreutils, utillinux, nettools, kbd, bc, which, gnused, gnugrep, groff, man-db, glibc, libiconv, pcre2, - gettext, ncurses, python + gettext, ncurses, python3 , writeText , useOperatingSystemEtc ? true - + }: with stdenv.lib; @@ -105,7 +105,7 @@ stdenv.mkDerivation rec { # Python: Autocompletion generated from manpages and config editing propagatedBuildInputs = [ coreutils gnugrep gnused bc - python groff gettext + python3 groff gettext ] ++ optional (!stdenv.isDarwin) man-db; postInstall = '' @@ -132,8 +132,10 @@ stdenv.mkDerivation rec { "$out/share/fish/functions/__fish_print_help.fish" sed -i "s|/sbin /usr/sbin||" \ "$out/share/fish/functions/__fish_complete_subcommand_root.fish" - sed -e "s|clear;|${ncurses.out}/bin/clear;|" \ - -i "$out/share/fish/functions/fish_default_key_bindings.fish" \ + sed -e "s|clear;|${getBin ncurses}/bin/clear;|" \ + -i "$out/share/fish/functions/fish_default_key_bindings.fish" + sed -e "s|python3|${getBin python3}/bin/python3|" \ + -i $out/share/fish/functions/{__fish_config_interactive.fish,fish_config.fish,fish_update_completions.fish} '' + optionalString stdenv.isLinux '' sed -e "s| ul| ${utillinux}/bin/ul|" \ |