diff options
| author | zimbatm <zimbatm@zimbatm.com> | 2016-02-28 22:09:32 +0000 |
|---|---|---|
| committer | zimbatm <zimbatm@zimbatm.com> | 2016-02-28 22:09:32 +0000 |
| commit | 57f7ff00fe468f07fe72ffa8189ab5a4a5fa5ea1 (patch) | |
| tree | 51cfcaac1ecdf18921c967b4d61791c270258fac /pkgs/shells/fish | |
| parent | 79c3725185066784129eaeb0282340ef827dd38a (diff) | |
| parent | 010271d47ac86e3a11117c6d5266d2cc77db9b47 (diff) | |
| download | nixpkgs-57f7ff00fe468f07fe72ffa8189ab5a4a5fa5ea1.tar nixpkgs-57f7ff00fe468f07fe72ffa8189ab5a4a5fa5ea1.tar.gz nixpkgs-57f7ff00fe468f07fe72ffa8189ab5a4a5fa5ea1.tar.bz2 nixpkgs-57f7ff00fe468f07fe72ffa8189ab5a4a5fa5ea1.tar.lz nixpkgs-57f7ff00fe468f07fe72ffa8189ab5a4a5fa5ea1.tar.xz nixpkgs-57f7ff00fe468f07fe72ffa8189ab5a4a5fa5ea1.tar.zst nixpkgs-57f7ff00fe468f07fe72ffa8189ab5a4a5fa5ea1.zip | |
Merge pull request #13368 from nathan7/fish-ul
fish: fix hidden dependency on ul(1) on Linux
Diffstat (limited to 'pkgs/shells/fish')
| -rw-r--r-- | pkgs/shells/fish/default.nix | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index 88754fd95a1..52121294067 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, glibc }: stdenv.mkDerivation rec { name = "fish-${version}"; @@ -45,6 +45,13 @@ 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" + + for cur in $out/share/fish/functions/*.fish; do + substituteInPlace "$cur" --replace "/usr/bin/getent" "${glibc}/bin/getent" + done '' + 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" |