diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-04-19 21:40:07 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-04-19 21:40:07 +0000 |
commit | e24547ab88075aad3dbbb86631558cdeb5fa69f9 (patch) | |
tree | 307193a575dc4270bf1e1117bb6b4b0c4557167b /pkgs/development/libraries/libarchive | |
parent | 9aa30ba705eb19a9f0aeaf775d58baff3ef1deb5 (diff) | |
download | nixlib-e24547ab88075aad3dbbb86631558cdeb5fa69f9.tar nixlib-e24547ab88075aad3dbbb86631558cdeb5fa69f9.tar.gz nixlib-e24547ab88075aad3dbbb86631558cdeb5fa69f9.tar.bz2 nixlib-e24547ab88075aad3dbbb86631558cdeb5fa69f9.tar.lz nixlib-e24547ab88075aad3dbbb86631558cdeb5fa69f9.tar.xz nixlib-e24547ab88075aad3dbbb86631558cdeb5fa69f9.tar.zst nixlib-e24547ab88075aad3dbbb86631558cdeb5fa69f9.zip |
* libvirt updated to 0.9.11.
svn path=/nixpkgs/trunk/; revision=33850
Diffstat (limited to 'pkgs/development/libraries/libarchive')
-rw-r--r-- | pkgs/development/libraries/libarchive/default.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix index 36e345043e3c..fc554dcd8756 100644 --- a/pkgs/development/libraries/libarchive/default.nix +++ b/pkgs/development/libraries/libarchive/default.nix @@ -1,5 +1,5 @@ -{fetchurl, stdenv, acl, openssl, libxml2, attr, zlib, bzip2, e2fsprogs -, sharutils}: +{ fetchurl, stdenv, acl, openssl, libxml2, attr, zlib, bzip2, e2fsprogs +, sharutils }: stdenv.mkDerivation rec { name = "libarchive-2.8.3"; @@ -9,10 +9,10 @@ stdenv.mkDerivation rec { sha256 = "16095d15334b3c8dbb02db5af3d415f12c1c3bdd4eb43af7bbc36ab7572c0b7a"; }; - propagatedBuildInputs = [libxml2 zlib bzip2 openssl] ++ - (if stdenv.isLinux then [e2fsprogs attr acl] else []); + propagatedBuildInputs = [ libxml2 zlib bzip2 openssl ] ++ + stdenv.lib.optionals stdenv.isLinux [ e2fsprogs attr acl ]; - buildInputs = [sharutils]; + buildInputs = [ sharutils ]; meta = { description = "A library for reading and writing streaming archives"; |