diff options
-rw-r--r-- | pkgs/os-specific/linux/libselinux/default.nix | 7 | ||||
-rw-r--r-- | pkgs/top-level/unix-tools.nix | 4 |
2 files changed, 5 insertions, 6 deletions
diff --git a/pkgs/os-specific/linux/libselinux/default.nix b/pkgs/os-specific/linux/libselinux/default.nix index 59d5db52ac6..a172e45e7fa 100644 --- a/pkgs/os-specific/linux/libselinux/default.nix +++ b/pkgs/os-specific/linux/libselinux/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pcre, pkgconfig, libsepol , enablePython ? true, swig ? null, python ? null -, musl-fts +, fts }: assert enablePython -> swig != null && python != null; @@ -18,9 +18,8 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libsepol pcre ] - ++ optionals enablePython [ swig python ] - ++ optional stdenv.hostPlatform.isMusl musl-fts; + buildInputs = [ libsepol pcre fts ] + ++ optionals enablePython [ swig python ]; # drop fortify here since package uses it by default, leading to compile error: # command-line>:0:0: error: "_FORTIFY_SOURCE" redefined [-Werror] diff --git a/pkgs/top-level/unix-tools.nix b/pkgs/top-level/unix-tools.nix index f8e269168a1..64979ba3234 100644 --- a/pkgs/top-level/unix-tools.nix +++ b/pkgs/top-level/unix-tools.nix @@ -50,12 +50,12 @@ let linux = pkgs.utillinux; }; getconf = { - linux = if hostPlatform.isGNU then lib.getBin pkgs.glibc + linux = if hostPlatform.libc == "glibc" then lib.getBin pkgs.glibc else pkgs.netbsd.getconf; darwin = pkgs.darwin.system_cmds; }; getent = { - linux = if hostPlatform.isGNU then lib.getBin pkgs.glibc + linux = if hostPlatform.libc == "glibc" then lib.getBin pkgs.glibc else pkgs.netbsd.getent; darwin = pkgs.netbsd.getent; }; |