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

unix-tools: fixup

Browse Source
This commit is contained in:
Matthew Justin Bauer 2018-04-11 12:46:53 -05:00 committed by GitHub
parent ce5455b2ba
commit 27dd872227
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
{ pkgs, buildEnv, runCommand, hostPlatform }: { pkgs, buildEnv, runCommand, hostPlatform, stdenv, lib }:
# These are some unix tools that are commonly included in the /usr/bin # These are some unix tools that are commonly included in the /usr/bin
# and /usr/sbin directory under more normal distributions. Along with # and /usr/sbin directory under more normal distributions. Along with
@ -45,11 +45,14 @@ in rec {
linux = pkgs.utillinux; linux = pkgs.utillinux;
}; };
getconf = singleBinary "getconf" { getconf = singleBinary "getconf" {
linux = pkgs.musl-getconf; linux = if hostPlatform.isMusl then pkgs.musl-getconf
else lib.getBin stdenv.cc.libc;
darwin = pkgs.darwin.system_cmds; darwin = pkgs.darwin.system_cmds;
}; };
getent = singleBinary "getconf" { getent = singleBinary "getent" {
linux = pkgs.musl-getent; linux = if hostPlatform.isMusl then pkgs.musl-getent
# This may not be right on other platforms, but preserves existing behavior
else /* if hostPlatform.libc == "glibc" then */ pkgs.glibc.bin;
}; };
getopt = singleBinary "getopt" { getopt = singleBinary "getopt" {
linux = pkgs.utillinux; linux = pkgs.utillinux;