diff options
| author | Nathan Zadoks <nathan@nathan7.eu> | 2016-02-22 16:25:01 +0100 |
|---|---|---|
| committer | Nathan Zadoks <nathan@nathan7.eu> | 2016-02-28 22:27:53 +0100 |
| commit | da1f465b9472d448ce62ac46fce9f95cfe3f2575 (patch) | |
| tree | 27fa829db209f4cdda25a69cd6e8d623654a238f /pkgs/shells/fish | |
| parent | b3faef0d9328446cf819fa897116aff28c10a9f9 (diff) | |
| download | nixpkgs-da1f465b9472d448ce62ac46fce9f95cfe3f2575.tar nixpkgs-da1f465b9472d448ce62ac46fce9f95cfe3f2575.tar.gz nixpkgs-da1f465b9472d448ce62ac46fce9f95cfe3f2575.tar.bz2 nixpkgs-da1f465b9472d448ce62ac46fce9f95cfe3f2575.tar.lz nixpkgs-da1f465b9472d448ce62ac46fce9f95cfe3f2575.tar.xz nixpkgs-da1f465b9472d448ce62ac46fce9f95cfe3f2575.tar.zst nixpkgs-da1f465b9472d448ce62ac46fce9f95cfe3f2575.zip | |
fish: fix hidden dependency on utillinux on Linux
Diffstat (limited to 'pkgs/shells/fish')
| -rw-r--r-- | pkgs/shells/fish/default.nix | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index 11eeb18661c..510a9b6f44f 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, ncurses, nettools, python, which, groff, gettext, man_db, - bc, libiconv, coreutils, gnused, kbd }: + bc, libiconv, coreutils, gnused, kbd, utillinux }: stdenv.mkDerivation rec { name = "fish-${version}"; @@ -43,6 +43,9 @@ stdenv.mkDerivation rec { "$out/share/fish/functions/prompt_pwd.fish" substituteInPlace "$out/share/fish/functions/fish_default_key_bindings.fish" \ --replace "clear;" "${ncurses}/bin/clear;" + '' + stdenv.lib.optionalString stdenv.isLinux '' + substituteInPlace "$out/share/fish/functions/__fish_print_help.fish" \ + --replace "| ul" "| ${utillinux}/bin/ul" '' + 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" |