diff options
author | John Ericson <Ericson2314@yahoo.com> | 2018-06-01 13:27:59 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-06-01 13:27:59 -0400 |
commit | 7a2dd975695623723b40811c4b60eac6da4b1eb6 (patch) | |
tree | e5719fbcc9e5df609140a5be088fc1247708c4db /pkgs/tools | |
parent | 19fa9b2e309877734bb47ff3150e504dbba9d417 (diff) | |
parent | 7aca4b47c8d312fdb10b086c5d93d04d884fc62f (diff) | |
download | nixlib-7a2dd975695623723b40811c4b60eac6da4b1eb6.tar nixlib-7a2dd975695623723b40811c4b60eac6da4b1eb6.tar.gz nixlib-7a2dd975695623723b40811c4b60eac6da4b1eb6.tar.bz2 nixlib-7a2dd975695623723b40811c4b60eac6da4b1eb6.tar.lz nixlib-7a2dd975695623723b40811c4b60eac6da4b1eb6.tar.xz nixlib-7a2dd975695623723b40811c4b60eac6da4b1eb6.tar.zst nixlib-7a2dd975695623723b40811c4b60eac6da4b1eb6.zip |
Merge pull request #41320 from matthewbauer/bsd-switch
Switch Nixpkgs to using more NetBSD stuff for MUSL
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/compression/xar/default.nix | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/tools/compression/xar/default.nix b/pkgs/tools/compression/xar/default.nix index 01d18fe6ad7d..69d4284b795d 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, musl-fts }: +{ stdenv, fetchurl, libxml2, openssl, zlib, bzip2, fts }: stdenv.mkDerivation rec { version = "1.6.1"; @@ -9,8 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0ghmsbs6xwg1092v7pjcibmk5wkyifwxw6ygp08gfz25d2chhipf"; }; - buildInputs = [ libxml2 openssl zlib bzip2 ] - ++ stdenv.lib.optional stdenv.hostPlatform.isMusl musl-fts; + buildInputs = [ libxml2 openssl zlib bzip2 fts ]; meta = { homepage = https://mackyle.github.io/xar/; |