diff options
| author | Will Dietz <w@wdtz.org> | 2018-01-11 18:46:34 -0600 |
|---|---|---|
| committer | Will Dietz <w@wdtz.org> | 2018-02-13 09:44:35 -0600 |
| commit | 172af30d8a3d19749bbf00aa09e487510205ff01 (patch) | |
| tree | 75894a214b0511d84c83b93618eb2e6802e48cfa /pkgs/shells/fish | |
| parent | d4a2e336b4f126525f9e88dbf857dbaeb0d17d9d (diff) | |
| download | nixpkgs-172af30d8a3d19749bbf00aa09e487510205ff01.tar nixpkgs-172af30d8a3d19749bbf00aa09e487510205ff01.tar.gz nixpkgs-172af30d8a3d19749bbf00aa09e487510205ff01.tar.bz2 nixpkgs-172af30d8a3d19749bbf00aa09e487510205ff01.tar.lz nixpkgs-172af30d8a3d19749bbf00aa09e487510205ff01.tar.xz nixpkgs-172af30d8a3d19749bbf00aa09e487510205ff01.tar.zst nixpkgs-172af30d8a3d19749bbf00aa09e487510205ff01.zip | |
fish: on musl use musl-getent
Diffstat (limited to 'pkgs/shells/fish')
| -rw-r--r-- | pkgs/shells/fish/default.nix | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index 490832d31d8..3078dd2dcab 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, coreutils, utillinux, nettools, kbd, bc, which, gnused, gnugrep, - groff, man-db, glibc, libiconv, pcre2, + groff, man-db, glibc, musl-getent, libiconv, pcre2, gettext, ncurses, python3 , writeText @@ -12,6 +12,9 @@ with stdenv.lib; let + getent = if stdenv.hostPlatform.isMusl + then "${musl-getent}/bin/getent" + else "${glibc.bin}/bin/getent"; etcConfigAppendixText = '' ############### ↓ Nix hook for sourcing /etc/fish/config.fish ↓ ############### # # @@ -142,7 +145,7 @@ let sed -e "s| ul| ${utillinux}/bin/ul|" \ -i "$out/share/fish/functions/__fish_print_help.fish" for cur in $out/share/fish/functions/*.fish; do - sed -e "s|/usr/bin/getent|${glibc.bin}/bin/getent|" \ + sed -e "s|/usr/bin/getent|${getent}|" \ -i "$cur" done |