BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #11691 from projedi/fish-darwin-hostname-fix

Browse source 
fish: Use /bin/hostname on darwin. Fixes #11012.
This commit is contained in:
Oliver Charles 2015-12-14 10:00:48 +00:00
commit 30a99f3185
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/shells/fish/default.nix
View file

@ -23,7 +23,6 @@ stdenv.mkDerivation rec {
-i "$out/share/fish/functions/seq.fish" \
"$out/share/fish/functions/math.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 -e "s|gettext |${gettext}/bin/gettext |" \
-e "s|which |${which}/bin/which |" \
@ -31,6 +30,7 @@ stdenv.mkDerivation rec {
substituteInPlace "$out/share/fish/functions/fish_default_key_bindings.fish" \
--replace "clear;" "${ncurses}/bin/clear;"
'' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
sed -i "s|(hostname\||(${nettools}/bin/hostname\||" "$out/share/fish/functions/fish_prompt.fish"
sed -i "s|Popen(\['manpath'|Popen(\['${man_db}/bin/manpath'|" "$out/share/fish/tools/create_manpage_completions.py"
'' + ''
sed -i "s|/sbin /usr/sbin||" \