JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

poppler: 0.28.1 -> 0.32.0 and cmake -> configure

Browse Source 
Use autotools build script rather than cmake as the cmake build script
is buggy (doesn't seem to work with openjpeg2)

Fixes build on Darwin and openjpeg2 support on Linux
This commit is contained in:
Spencer Whitt 2015-04-01 16:33:55 -04:00
parent d27ba2824a
commit 1155bb97f8
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/development/libraries/poppler/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, fetchpatch, pkgconfig, cmake, libiconv, libintlOrEmpty { stdenv, fetchurl, fetchpatch, pkgconfig, libiconv, libintlOrEmpty
, zlib, curl, cairo, freetype, fontconfig, lcms, libjpeg, openjpeg , zlib, curl, cairo, freetype, fontconfig, lcms, libjpeg, openjpeg
, qt4Support ? false, qt4 ? null, qt5 , qt4Support ? false, qt4 ? null, qt5
}: }:
let let
version = "0.28.1"; # even major numbers are stable version = "0.32.0"; # even major numbers are stable
sha256 = "01pxjdbhvpxf00ncf8d9wxc8gkcqcxz59lwrpa151ah988inxkrc"; sha256 = "162vfbvbz0frvqyk00ldsbl49h4bj8i8wn0ngfl30xg1lldy6qs9";
# This is for Okular (and similar) to support subpixel rendering. # This is for Okular (and similar) to support subpixel rendering.
# It's kept from upstream because of political reasons. # It's kept from upstream because of political reasons.
@ -26,9 +26,13 @@ let
propagatedBuildInputs = [ zlib cairo freetype fontconfig libjpeg lcms curl openjpeg ]; propagatedBuildInputs = [ zlib cairo freetype fontconfig libjpeg lcms curl openjpeg ];
nativeBuildInputs = [ pkgconfig cmake libiconv ] ++ libintlOrEmpty; nativeBuildInputs = [ pkgconfig libiconv ] ++ libintlOrEmpty;
cmakeFlags = "-DENABLE_XPDF_HEADERS=ON -DENABLE_LIBCURL=ON -DENABLE_ZLIB=ON"; configureFlags = [
"--enable-xpdf-headers"
"--enable-libcurl"
"--enable-zlib"
];
patches = [ ./datadir_env.patch ./poppler-glib.patch ]; patches = [ ./datadir_env.patch ./poppler-glib.patch ];