diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-09-11 11:51:59 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-09-11 11:51:59 +0200 |
commit | 554558e3cacc3ba5670542cf7849bf8c6bb970ff (patch) | |
tree | ac1a14da35fc6f9540ab34170d3291790c35900d | |
parent | c922c20cff06aeb92136efb4d14d5a4bbbcc3a45 (diff) | |
parent | 856b4623c4483237e96f393603413daa92178e8c (diff) | |
download | nixlib-554558e3cacc3ba5670542cf7849bf8c6bb970ff.tar nixlib-554558e3cacc3ba5670542cf7849bf8c6bb970ff.tar.gz nixlib-554558e3cacc3ba5670542cf7849bf8c6bb970ff.tar.bz2 nixlib-554558e3cacc3ba5670542cf7849bf8c6bb970ff.tar.lz nixlib-554558e3cacc3ba5670542cf7849bf8c6bb970ff.tar.xz nixlib-554558e3cacc3ba5670542cf7849bf8c6bb970ff.tar.zst nixlib-554558e3cacc3ba5670542cf7849bf8c6bb970ff.zip |
Merge #17834: libarchive: make XAR support configurable
-rw-r--r-- | pkgs/development/libraries/libarchive/default.nix | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix index 0c5f900dd412..4fe7f62bf3ff 100644 --- a/pkgs/development/libraries/libarchive/default.nix +++ b/pkgs/development/libraries/libarchive/default.nix @@ -1,5 +1,12 @@ -{ fetchurl, stdenv, acl, openssl, libxml2, attr, zlib, bzip2, e2fsprogs, xz, lzo -, sharutils }: +{ + fetchurl, stdenv, + acl, attr, bzip2, e2fsprogs, libxml2, lzo, openssl, sharutils, xz, zlib, + + # Optional but increases closure only negligibly. + xarSupport ? true, +}: + +assert xarSupport -> libxml2 != null; stdenv.mkDerivation rec { name = "libarchive-${version}"; @@ -10,12 +17,15 @@ stdenv.mkDerivation rec { sha256 = "1lngng84k1kkljl74q0cdqc3s82vn2kimfm02dgm4d6m7x71mvkj"; }; - buildInputs = [ sharutils libxml2 zlib bzip2 openssl xz lzo ] ++ - stdenv.lib.optionals stdenv.isLinux [ e2fsprogs attr acl ]; + buildInputs = [ sharutils zlib bzip2 openssl xz lzo ] + ++ stdenv.lib.optionals stdenv.isLinux [ e2fsprogs attr acl ] + ++ stdenv.lib.optional xarSupport libxml2; # Without this, pkgconfig-based dependencies are unhappy propagatedBuildInputs = stdenv.lib.optionals stdenv.isLinux [ attr acl ]; + configureFlags = stdenv.lib.optional (!xarSupport) "--without-xml2"; + preBuild = if stdenv.isCygwin then '' echo "#include <windows.h>" >> config.h '' else null; |