diff options
| author | Will Dietz <w@wdtz.org> | 2018-03-26 13:50:20 -0500 |
|---|---|---|
| committer | Will Dietz <w@wdtz.org> | 2018-03-26 14:00:11 -0500 |
| commit | 69ca33057e489012b87b93771193862c744fc097 (patch) | |
| tree | 9694dee3c10e7594ff314b02d688b7bce2b876e8 /pkgs | |
| parent | ebf04d83c028906570d6cd09fc29780732888a50 (diff) | |
| download | nixpkgs-69ca33057e489012b87b93771193862c744fc097.tar nixpkgs-69ca33057e489012b87b93771193862c744fc097.tar.gz nixpkgs-69ca33057e489012b87b93771193862c744fc097.tar.bz2 nixpkgs-69ca33057e489012b87b93771193862c744fc097.tar.lz nixpkgs-69ca33057e489012b87b93771193862c744fc097.tar.xz nixpkgs-69ca33057e489012b87b93771193862c744fc097.tar.zst nixpkgs-69ca33057e489012b87b93771193862c744fc097.zip | |
xar, libselinux: use musl-fts on musl, fix
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/os-specific/linux/libselinux/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/compression/xar/default.nix | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/libselinux/default.nix b/pkgs/os-specific/linux/libselinux/default.nix index 541ead7258f..c276f56dd8b 100644 --- a/pkgs/os-specific/linux/libselinux/default.nix +++ b/pkgs/os-specific/linux/libselinux/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, libsepol, pcre , enablePython ? true, swig ? null, python ? null +, musl-fts }: assert enablePython -> swig != null && python != null; @@ -18,7 +19,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libsepol pcre ] - ++ optionals enablePython [ swig python ]; + ++ optionals enablePython [ swig python ] + ++ optional stdenv.hostPlatform.isMusl musl-fts; # Avoid this false warning: # avc_internal.c: In function 'avc_netlink_receive': diff --git a/pkgs/tools/compression/xar/default.nix b/pkgs/tools/compression/xar/default.nix index c62eead3cb7..01d18fe6ad7 100644 --- a/pkgs/tools/compression/xar/default.nix +++ b/pkgs/tools/compression/xar/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libxml2, openssl, zlib, bzip2 }: +{ stdenv, fetchurl, libxml2, openssl, zlib, bzip2, musl-fts }: stdenv.mkDerivation rec { version = "1.6.1"; @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0ghmsbs6xwg1092v7pjcibmk5wkyifwxw6ygp08gfz25d2chhipf"; }; - buildInputs = [ libxml2 openssl zlib bzip2 ]; + buildInputs = [ libxml2 openssl zlib bzip2 ] + ++ stdenv.lib.optional stdenv.hostPlatform.isMusl musl-fts; meta = { homepage = https://mackyle.github.io/xar/; |