diff options
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 11 | ||||
| -rw-r--r-- | pkgs/top-level/unix-tools.nix | 7 |
2 files changed, 9 insertions, 9 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 72a2fb90f4b..7f7c74611e1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13703,14 +13703,6 @@ with pkgs; musl-fts = callPackage ../os-specific/linux/musl/fts.nix { }; musl-getconf = callPackage ../os-specific/linux/musl/getconf.nix { }; musl-getent = callPackage ../os-specific/linux/musl/getent.nix { }; - getent = - if hostPlatform.isMusl then musl-getent - # This may not be right on other platforms, but preserves existing behavior - else /* if hostPlatform.libc == "glibc" then */ glibc.bin; - - getconf = - if hostPlatform.isMusl then musl-getconf - else lib.getBin stdenv.cc.libc; nettools = if stdenv.isLinux then callPackage ../os-specific/linux/net-tools { } else unixtools.nettools; @@ -21228,5 +21220,6 @@ with pkgs; # Unix tools unixtools = recurseIntoAttrs (callPackages ./unix-tools.nix { }); inherit (unixtools) hexdump ps logger eject modprobe umount - mount wall hostname more sysctl; + mount wall hostname more sysctl getconf + getent; } diff --git a/pkgs/top-level/unix-tools.nix b/pkgs/top-level/unix-tools.nix index 0d6e8d1c6c2..69bd6b7a7cc 100644 --- a/pkgs/top-level/unix-tools.nix +++ b/pkgs/top-level/unix-tools.nix @@ -44,6 +44,13 @@ in rec { eject = singleBinary "eject" { linux = pkgs.utillinux; }; + getconf = singleBinary "getconf" { + linux = pkgs.musl-getconf; + darwin = pkgs.system_cmds; + }; + getent = singleBinary "getconf" { + linux = pkgs.musl-getent; + }; getopt = singleBinary "getopt" { linux = pkgs.utillinux; darwin = pkgs.getopt; |