diff options
| author | Will Dietz <w@wdtz.org> | 2018-02-13 11:38:14 -0600 |
|---|---|---|
| committer | Will Dietz <w@wdtz.org> | 2018-02-13 11:47:16 -0600 |
| commit | d3b59f864a3dfe37432095568673c97df79107bc (patch) | |
| tree | 3fc998aa130eaf5b1b8fa8cb90067ff7121e7fb9 /pkgs/shells/fish | |
| parent | 6c3df22c5a861827a62cae31bde622ce668d5446 (diff) | |
| download | nixpkgs-d3b59f864a3dfe37432095568673c97df79107bc.tar nixpkgs-d3b59f864a3dfe37432095568673c97df79107bc.tar.gz nixpkgs-d3b59f864a3dfe37432095568673c97df79107bc.tar.bz2 nixpkgs-d3b59f864a3dfe37432095568673c97df79107bc.tar.lz nixpkgs-d3b59f864a3dfe37432095568673c97df79107bc.tar.xz nixpkgs-d3b59f864a3dfe37432095568673c97df79107bc.tar.zst nixpkgs-d3b59f864a3dfe37432095568673c97df79107bc.zip | |
define top-level attrs for getent, getconf
Note that currently getent is explicitly taken from "glibc.bin", regardless of build configuration which this preserves for now. (on non-musl anyway)
Diffstat (limited to 'pkgs/shells/fish')
| -rw-r--r-- | pkgs/shells/fish/default.nix | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index 3078dd2dcab..d6c107e9953 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, musl-getent, libiconv, pcre2, + groff, man-db, getent, libiconv, pcre2, gettext, ncurses, python3 , writeText @@ -12,9 +12,6 @@ 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 ↓ ############### # # @@ -145,7 +142,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|${getent}|" \ + sed -e "s|/usr/bin/getent|${getent}/bin/getent|" \ -i "$cur" done |