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

Merge pull request #8818 from mstarzyk/fish-seq-fix

Browse Source 
fish: Fixed "Could not autoload item 'seq'..."
This commit is contained in:
lethalman 2015-07-15 01:04:49 +02:00
commit 1cd2148c8f
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/shells/fish/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, ncurses, python, which, groff, gettext, man_db, bc, libiconv }: { stdenv, fetchurl, ncurses, python, which, groff, gettext, man_db, bc, libiconv, coreutils }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "fish-${version}"; name = "fish-${version}";
@ -15,10 +15,12 @@ stdenv.mkDerivation rec {
# Python: Autocompletion generated from manpages and config editing # Python: Autocompletion generated from manpages and config editing
propagatedBuildInputs = [ python which groff gettext ] propagatedBuildInputs = [ python which groff gettext ]
++ stdenv.lib.optional (!stdenv.isDarwin) man_db ++ stdenv.lib.optional (!stdenv.isDarwin) man_db
++ [ bc ]; ++ [ bc coreutils ];
postInstall = '' postInstall = ''
sed -i "s|bc|${bc}/bin/bc|" "$out/share/fish/functions/seq.fish" sed -e "s|bc|${bc}/bin/bc|" \
-e "s|/usr/bin/seq|${coreutils}/bin/seq|" \
-i "$out/share/fish/functions/seq.fish"
sed -i "s|which |${which}/bin/which |" "$out/share/fish/functions/type.fish" sed -i "s|which |${which}/bin/which |" "$out/share/fish/functions/type.fish"
sed -i "s|nroff |${groff}/bin/nroff |" "$out/share/fish/functions/__fish_print_help.fish" sed -i "s|nroff |${groff}/bin/nroff |" "$out/share/fish/functions/__fish_print_help.fish"
sed -e "s|gettext |${gettext}/bin/gettext |" \ sed -e "s|gettext |${gettext}/bin/gettext |" \