diff options
| author | Nathan Zadoks <nathan@nathan7.eu> | 2016-02-28 22:26:42 +0100 |
|---|---|---|
| committer | Nathan Zadoks <nathan@nathan7.eu> | 2016-02-28 22:27:53 +0100 |
| commit | 010271d47ac86e3a11117c6d5266d2cc77db9b47 (patch) | |
| tree | a8106912ff7515fddaedaa5587d5cb80a412a7e8 /pkgs/shells/fish | |
| parent | da1f465b9472d448ce62ac46fce9f95cfe3f2575 (diff) | |
| download | nixpkgs-010271d47ac86e3a11117c6d5266d2cc77db9b47.tar nixpkgs-010271d47ac86e3a11117c6d5266d2cc77db9b47.tar.gz nixpkgs-010271d47ac86e3a11117c6d5266d2cc77db9b47.tar.bz2 nixpkgs-010271d47ac86e3a11117c6d5266d2cc77db9b47.tar.lz nixpkgs-010271d47ac86e3a11117c6d5266d2cc77db9b47.tar.xz nixpkgs-010271d47ac86e3a11117c6d5266d2cc77db9b47.tar.zst nixpkgs-010271d47ac86e3a11117c6d5266d2cc77db9b47.zip | |
fish: fix hidden dependency on ${glibc}/bin/getent on Linux
Diffstat (limited to 'pkgs/shells/fish')
| -rw-r--r-- | pkgs/shells/fish/default.nix | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index 510a9b6f44f..83c8e3c5816 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, utillinux }: + bc, libiconv, coreutils, gnused, kbd, utillinux, glibc }: stdenv.mkDerivation rec { name = "fish-${version}"; @@ -46,6 +46,10 @@ stdenv.mkDerivation rec { '' + 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" |