podofo: 0.9.4 -> 0.9.5

This commit is contained in:
Robin Gloster 2017-02-14 07:43:25 +01:00
parent d9d66375ec
commit 449c895f31
No known key found for this signature in database
GPG Key ID: 5E4C836C632C2882

View File

@ -1,16 +1,16 @@
{ stdenv, fetchurl, cmake, zlib, freetype, libjpeg, libtiff, fontconfig { stdenv, fetchurl, cmake, zlib, freetype, libjpeg, libtiff, fontconfig
, gcc5, openssl, libpng, lua5 }: , gcc5, openssl, libpng, lua5, pkgconfig, libidn, expat }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "podofo-0.9.4"; name = "podofo-0.9.5";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/podofo/${name}.tar.gz"; url = "mirror://sourceforge/podofo/${name}.tar.gz";
sha256 = "0ngqgwl38afmzcj2zpf18a2g63vhm2fp45cbf9z62129rdgm1pyc"; sha256 = "012kgfx5j5n6w4zkc1d290d2cwjk60jhzsjlr2x19g3yi75q2jc5";
}; };
propagatedBuildInputs = [ zlib freetype libjpeg libtiff fontconfig openssl libpng ]; propagatedBuildInputs = [ zlib freetype libjpeg libtiff fontconfig openssl libpng libidn expat ];
nativeBuildInputs = [ cmake gcc5 ]; nativeBuildInputs = [ cmake gcc5 pkgconfig ];
buildInputs = [ lua5 stdenv.cc.libc ]; buildInputs = [ lua5 stdenv.cc.libc ];
crossAttrs = { crossAttrs = {
@ -19,15 +19,6 @@ stdenv.mkDerivation rec {
lua5.crossDrv stdenv.ccCross.libc ]; 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"; cmakeFlags = "-DPODOFO_BUILD_SHARED=ON -DPODOFO_BUILD_STATIC=OFF";
meta = { meta = {