From da1f465b9472d448ce62ac46fce9f95cfe3f2575 Mon Sep 17 00:00:00 2001 From: Nathan Zadoks Date: Mon, 22 Feb 2016 16:25:01 +0100 Subject: fish: fix hidden dependency on utillinux on Linux --- pkgs/shells/fish/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'pkgs/shells') diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index 11eeb18661c0..510a9b6f44f9 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" -- cgit v1.2.3 From 010271d47ac86e3a11117c6d5266d2cc77db9b47 Mon Sep 17 00:00:00 2001 From: Nathan Zadoks Date: Sun, 28 Feb 2016 22:26:42 +0100 Subject: fish: fix hidden dependency on ${glibc}/bin/getent on Linux --- pkgs/shells/fish/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'pkgs/shells') diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index 510a9b6f44f9..83c8e3c58160 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" -- cgit v1.2.3