diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-02-10 18:33:14 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-02-10 18:33:14 +0000 |
| commit | 761785c4ab0728b677db03cc9988538dd81ae51e (patch) | |
| tree | ae9e277cfa564cffb8ac50abea236094c068e005 | |
| parent | c5617dc628d1854ca792d9a9ea86bc830595a685 (diff) | |
| download | nixpkgs-761785c4ab0728b677db03cc9988538dd81ae51e.tar nixpkgs-761785c4ab0728b677db03cc9988538dd81ae51e.tar.gz nixpkgs-761785c4ab0728b677db03cc9988538dd81ae51e.tar.bz2 nixpkgs-761785c4ab0728b677db03cc9988538dd81ae51e.tar.lz nixpkgs-761785c4ab0728b677db03cc9988538dd81ae51e.tar.xz nixpkgs-761785c4ab0728b677db03cc9988538dd81ae51e.tar.zst nixpkgs-761785c4ab0728b677db03cc9988538dd81ae51e.zip | |
* Fix ebook-tools. It broke because of the libzip update.
svn path=/nixpkgs/trunk/; revision=32215
| -rw-r--r-- | pkgs/tools/text/ebook-tools/default.nix | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/pkgs/tools/text/ebook-tools/default.nix b/pkgs/tools/text/ebook-tools/default.nix index 87a75b2559b..abb766928d7 100644 --- a/pkgs/tools/text/ebook-tools/default.nix +++ b/pkgs/tools/text/ebook-tools/default.nix @@ -1,22 +1,23 @@ -{ stdenv, fetchurl, cmake, libxml2, libzip }: - -let - pn = "ebook-tools"; -in +{ stdenv, fetchurl, cmake, pkgconfig, libxml2, libzip }: stdenv.mkDerivation rec { - name = "${pn}-0.2.1"; + name = "ebook-tools-0.2.1"; src = fetchurl { - url = "mirror://sf/${pn}/${name}.tar.gz"; + url = "mirror://sourceforge/ebook-tools/${name}.tar.gz"; sha256 = "0wgwdsd3jwwfg36jyr5j0wayqjli3ia80lxzk10byd4cmkywnhy2"; }; - buildInputs = [ cmake libxml2 libzip ]; + buildInputs = [ cmake pkgconfig libxml2 libzip ]; + + preConfigure = + '' + NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags libzip)" + ''; meta = { - homepage = "http://${pn}.sourceforge.net"; - description = "Tools and libs for dealing with various ebook file formats"; + homepage = "http://ebook-tools.sourceforge.net"; + description = "Tools and library for dealing with various ebook file formats"; maintainers = [ stdenv.lib.maintainers.urkud ]; platforms = stdenv.lib.platforms.all; }; |