diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-05-22 15:57:36 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-05-22 15:57:36 +0200 |
| commit | 09d06f5ffd867afc72d5ca6786f73aed2b80e207 (patch) | |
| tree | 0b39699b6fae1ea7f5e6b40b2214c901eb9a578b /pkgs/development/libraries/libe-book/default.nix | |
| parent | f106125f77ba2b3588f95ef58667763042f808c9 (diff) | |
| parent | a49afdf1743436ac07c9be9da1d27ea5461af571 (diff) | |
| download | nixlib-09d06f5ffd867afc72d5ca6786f73aed2b80e207.tar nixlib-09d06f5ffd867afc72d5ca6786f73aed2b80e207.tar.gz nixlib-09d06f5ffd867afc72d5ca6786f73aed2b80e207.tar.bz2 nixlib-09d06f5ffd867afc72d5ca6786f73aed2b80e207.tar.lz nixlib-09d06f5ffd867afc72d5ca6786f73aed2b80e207.tar.xz nixlib-09d06f5ffd867afc72d5ca6786f73aed2b80e207.tar.zst nixlib-09d06f5ffd867afc72d5ca6786f73aed2b80e207.zip | |
Merge remote-tracking branch 'origin/master' into systemd-219
Conflicts: pkgs/development/libraries/libseccomp/default.nix
Diffstat (limited to 'pkgs/development/libraries/libe-book/default.nix')
| -rw-r--r-- | pkgs/development/libraries/libe-book/default.nix | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/development/libraries/libe-book/default.nix b/pkgs/development/libraries/libe-book/default.nix index 81264b562b4d..fa47c1587c32 100644 --- a/pkgs/development/libraries/libe-book/default.nix +++ b/pkgs/development/libraries/libe-book/default.nix @@ -1,4 +1,7 @@ -{stdenv, fetchurl, gperf, pkgconfig, librevenge, libxml2, boost, icu, cppunit}: +{ stdenv, fetchurl, gperf, pkgconfig, librevenge, libxml2, boost, icu +, cppunit, zlib +}: + let s = # Generated upstream information rec { @@ -10,7 +13,7 @@ let sha256="1v48pd32r2pfysr3a3igc4ivcf6vvb26jq4pdkcnq75p70alp2bz"; }; buildInputs = [ - gperf pkgconfig librevenge libxml2 boost icu cppunit + gperf pkgconfig librevenge libxml2 boost icu cppunit zlib ]; in stdenv.mkDerivation { |