public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fish: fix the fish_config tool

Browse Source 
It requires a python interpreter to work.
This commit is contained in:
Profpatsch
2017-08-05 22:14:24 +02:00
parent c9d419a22b
commit b7290a283a
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/shells/fish/default.nix
+6 -4
View File
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, coreutils, utillinux, { stdenv, fetchurl, coreutils, utillinux,
nettools, kbd, bc, which, gnused, gnugrep, nettools, kbd, bc, which, gnused, gnugrep,
groff, man-db, glibc, libiconv, pcre2, groff, man-db, glibc, libiconv, pcre2,
gettext, ncurses, python gettext, ncurses, python3
, writeText , writeText
@@ -105,7 +105,7 @@ stdenv.mkDerivation rec {
# Python: Autocompletion generated from manpages and config editing # Python: Autocompletion generated from manpages and config editing
propagatedBuildInputs = [ propagatedBuildInputs = [
coreutils gnugrep gnused bc coreutils gnugrep gnused bc
python groff gettext python3 groff gettext
] ++ optional (!stdenv.isDarwin) man-db; ] ++ optional (!stdenv.isDarwin) man-db;
postInstall = '' postInstall = ''
@@ -132,8 +132,10 @@ stdenv.mkDerivation rec {
"$out/share/fish/functions/__fish_print_help.fish" "$out/share/fish/functions/__fish_print_help.fish"
sed -i "s|/sbin /usr/sbin||" \ sed -i "s|/sbin /usr/sbin||" \
"$out/share/fish/functions/__fish_complete_subcommand_root.fish" "$out/share/fish/functions/__fish_complete_subcommand_root.fish"
sed -e "s|clear;|${ncurses.out}/bin/clear;|" \ sed -e "s|clear;|${getBin ncurses}/bin/clear;|" \
-i "$out/share/fish/functions/fish_default_key_bindings.fish" \ -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 '' '' + optionalString stdenv.isLinux ''
sed -e "s| ul| ${utillinux}/bin/ul|" \ sed -e "s| ul| ${utillinux}/bin/ul|" \