diff options
| author | Alexander Shabalin <shabalyn.a@gmail.com> | 2015-12-13 22:52:35 +0300 |
|---|---|---|
| committer | Alexander Shabalin <shabalyn.a@gmail.com> | 2015-12-13 22:52:35 +0300 |
| commit | 020a09adbbc53301c45514c76dd8489a5175bce0 (patch) | |
| tree | ee0875d9332c4179a286e1bd0f2cbe062d8f764e /pkgs/shells/fish | |
| parent | 564757ab9b6ed1d2f9d6f65f278eb1fb8f43ead9 (diff) | |
| download | nixpkgs-020a09adbbc53301c45514c76dd8489a5175bce0.tar nixpkgs-020a09adbbc53301c45514c76dd8489a5175bce0.tar.gz nixpkgs-020a09adbbc53301c45514c76dd8489a5175bce0.tar.bz2 nixpkgs-020a09adbbc53301c45514c76dd8489a5175bce0.tar.lz nixpkgs-020a09adbbc53301c45514c76dd8489a5175bce0.tar.xz nixpkgs-020a09adbbc53301c45514c76dd8489a5175bce0.tar.zst nixpkgs-020a09adbbc53301c45514c76dd8489a5175bce0.zip | |
fish: Use /bin/hostname on darwin. Fixes #11012.
Diffstat (limited to 'pkgs/shells/fish')
| -rw-r--r-- | pkgs/shells/fish/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index c4386b1a9fb..ef3794d5144 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -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||" \ |