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

xar, libselinux: use musl-fts on musl, fix

Browse Source
This commit is contained in:
Will Dietz 2018-03-26 13:50:20 -05:00
parent ebf04d83c0
commit 69ca33057e
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/os-specific/linux/libselinux/default.nix
View File

@ -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':

5
pkgs/tools/compression/xar/default.nix
View File

@ -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/;