mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-21 04:49:01 +02:00
unix-tools: provide getconf and getent
This commit is contained in:
parent
6023849ba1
commit
f94c9c5459
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue