tjh.dev
Merge pull request #13368 from nathan7/fish-ul
fish: fix hidden dependency on ul(1) on Linux
zimbatm.tngl.sh
+8
-1
pkgs/shells/fish/default.nix
+8
-1
pkgs/shells/fish/default.nix
···
1
1
{ stdenv, fetchurl, ncurses, nettools, python, which, groff, gettext, man_db,
2
-
bc, libiconv, coreutils, gnused, kbd }:
2
+
bc, libiconv, coreutils, gnused, kbd, utillinux, glibc }:
3
3
4
4
stdenv.mkDerivation rec {
5
5
name = "fish-${version}";
···
45
45
"$out/share/fish/functions/prompt_pwd.fish"
46
46
substituteInPlace "$out/share/fish/functions/fish_default_key_bindings.fish" \
47
47
--replace "clear;" "${ncurses}/bin/clear;"
48
+
'' + stdenv.lib.optionalString stdenv.isLinux ''
49
+
substituteInPlace "$out/share/fish/functions/__fish_print_help.fish" \
50
+
--replace "| ul" "| ${utillinux}/bin/ul"
51
+
52
+
for cur in $out/share/fish/functions/*.fish; do
53
+
substituteInPlace "$cur" --replace "/usr/bin/getent" "${glibc}/bin/getent"
54
+
done
48
55
'' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
49
56
sed -i "s|(hostname\||(${nettools}/bin/hostname\||" "$out/share/fish/functions/fish_prompt.fish"
50
57
sed -i "s|Popen(\['manpath'|Popen(\['${man_db}/bin/manpath'|" "$out/share/fish/tools/create_manpage_completions.py"