public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

unix-tools: provide getconf and getent

Browse Source
This commit is contained in:
Matthew Bauer 2018-04-10 18:53:09 -05:00
parent 6023849ba1
commit f94c9c5459
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/top-level/all-packages.nix
View File

@ -13703,14 +13703,6 @@ with pkgs;
musl-fts = callPackage ../os-specific/linux/musl/fts.nix { }; musl-fts = callPackage ../os-specific/linux/musl/fts.nix { };
musl-getconf = callPackage ../os-specific/linux/musl/getconf.nix { }; musl-getconf = callPackage ../os-specific/linux/musl/getconf.nix { };
musl-getent = callPackage ../os-specific/linux/musl/getent.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 { } nettools = if stdenv.isLinux then callPackage ../os-specific/linux/net-tools { }
else unixtools.nettools; else unixtools.nettools;
@ -21228,5 +21220,6 @@ with pkgs;
# Unix tools # Unix tools
unixtools = recurseIntoAttrs (callPackages ./unix-tools.nix { }); unixtools = recurseIntoAttrs (callPackages ./unix-tools.nix { });
inherit (unixtools) hexdump ps logger eject modprobe umount inherit (unixtools) hexdump ps logger eject modprobe umount
mount wall hostname more sysctl; mount wall hostname more sysctl getconf
getent;
} }

7
pkgs/top-level/unix-tools.nix
View File

@ -44,6 +44,13 @@ in rec {
eject = singleBinary "eject" { eject = singleBinary "eject" {
linux = pkgs.utillinux; linux = pkgs.utillinux;
}; };
getconf = singleBinary "getconf" {
linux = pkgs.musl-getconf;
darwin = pkgs.system_cmds;
};
getent = singleBinary "getconf" {
linux = pkgs.musl-getent;
};
getopt = singleBinary "getopt" { getopt = singleBinary "getopt" {
linux = pkgs.utillinux; linux = pkgs.utillinux;
darwin = pkgs.getopt; darwin = pkgs.getopt;