diff options
| author | Robin Gloster <mail@glob.in> | 2017-02-14 07:43:25 +0100 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2017-02-17 00:14:01 +0100 |
| commit | 449c895f31f0e418aa7198428502c17f3aad5de2 (patch) | |
| tree | c97b6c9d1d499ec10c0d7cca33b4ea86806729de /pkgs/development/libraries/podofo | |
| parent | d9d66375ec58af5734cd7f995491dbc19a6d63dd (diff) | |
podofo: 0.9.4 -> 0.9.5
Diffstat (limited to 'pkgs/development/libraries/podofo')
| -rw-r--r-- | pkgs/development/libraries/podofo/default.nix | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/pkgs/development/libraries/podofo/default.nix b/pkgs/development/libraries/podofo/default.nix index b68bc20ecf350..d7569c017a7a5 100644 --- a/pkgs/development/libraries/podofo/default.nix +++ b/pkgs/development/libraries/podofo/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchurl, cmake, zlib, freetype, libjpeg, libtiff, fontconfig -, gcc5, openssl, libpng, lua5 }: +, gcc5, openssl, libpng, lua5, pkgconfig, libidn, expat }: stdenv.mkDerivation rec { - name = "podofo-0.9.4"; + name = "podofo-0.9.5"; src = fetchurl { url = "mirror://sourceforge/podofo/${name}.tar.gz"; - sha256 = "0ngqgwl38afmzcj2zpf18a2g63vhm2fp45cbf9z62129rdgm1pyc"; + sha256 = "012kgfx5j5n6w4zkc1d290d2cwjk60jhzsjlr2x19g3yi75q2jc5"; }; - propagatedBuildInputs = [ zlib freetype libjpeg libtiff fontconfig openssl libpng ]; - nativeBuildInputs = [ cmake gcc5 ]; + propagatedBuildInputs = [ zlib freetype libjpeg libtiff fontconfig openssl libpng libidn expat ]; + nativeBuildInputs = [ cmake gcc5 pkgconfig ]; buildInputs = [ lua5 stdenv.cc.libc ]; crossAttrs = { @@ -19,15 +19,6 @@ stdenv.mkDerivation rec { lua5.crossDrv stdenv.ccCross.libc ]; }; - # fix finding freetype-2.5 - preConfigure = '' - substituteInPlace ./CMakeLists.txt \ - --replace FREETYPE_INCLUDE_DIR FREETYPE_INCLUDE_DIRS \ - --replace 'FIND_PACKAGE(FREETYPE' 'FIND_PACKAGE(Freetype' - - rm ./cmake/modules/Find{FREETYPE,ZLIB,PkgConfig}.cmake - ''; - cmakeFlags = "-DPODOFO_BUILD_SHARED=ON -DPODOFO_BUILD_STATIC=OFF"; meta = { |