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

fish: fix use hostname from the store instead of from the environment

This commit is contained in:
Samuel Rivas 2015-11-06 09:55:55 +01:00
parent 5a162cd068
commit d3ed672b6a
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, ncurses, python, which, groff, gettext, man_db, bc, libiconv, coreutils }: { stdenv, fetchurl, ncurses, nettools, python, which, groff, gettext, man_db, bc, libiconv, coreutils }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "fish-${version}"; name = "fish-${version}";
@ -23,6 +23,7 @@ stdenv.mkDerivation rec {
-i "$out/share/fish/functions/seq.fish" \ -i "$out/share/fish/functions/seq.fish" \
"$out/share/fish/functions/math.fish" "$out/share/fish/functions/math.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|(hostname\||(${nettools}/bin/hostname\||" "$out/share/fish/functions/fish_prompt.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 |" \
-e "s|which |${which}/bin/which |" \ -e "s|which |${which}/bin/which |" \