diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2015-12-17 08:53:35 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2015-12-17 08:53:35 +0100 |
commit | 1c268e0b8cd07ccedec8cce34ddfc82eb8e9f947 (patch) | |
tree | 9fd16ff6cf9ab05124b8e0443b5e305f7d541aa0 /pkgs/shells/fish/default.nix | |
parent | 04d993417fec284a8f754de2d4a171e791f0ae2e (diff) | |
parent | 330afe9f4e7e4de4779c654b48225bed7ae1e0cb (diff) | |
download | nixlib-1c268e0b8cd07ccedec8cce34ddfc82eb8e9f947.tar nixlib-1c268e0b8cd07ccedec8cce34ddfc82eb8e9f947.tar.gz nixlib-1c268e0b8cd07ccedec8cce34ddfc82eb8e9f947.tar.bz2 nixlib-1c268e0b8cd07ccedec8cce34ddfc82eb8e9f947.tar.lz nixlib-1c268e0b8cd07ccedec8cce34ddfc82eb8e9f947.tar.xz nixlib-1c268e0b8cd07ccedec8cce34ddfc82eb8e9f947.tar.zst nixlib-1c268e0b8cd07ccedec8cce34ddfc82eb8e9f947.zip |
Merge master into staging
Diffstat (limited to 'pkgs/shells/fish/default.nix')
-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 c4386b1a9fb8..ef3794d5144c 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||" \ |