diff options
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/poppler/default.nix')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/poppler/default.nix | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/nixpkgs/pkgs/development/libraries/poppler/default.nix b/nixpkgs/pkgs/development/libraries/poppler/default.nix index 53ed04527a84..f1b6c002488e 100644 --- a/nixpkgs/pkgs/development/libraries/poppler/default.nix +++ b/nixpkgs/pkgs/development/libraries/poppler/default.nix @@ -8,7 +8,7 @@ }: let # beware: updates often break cups-filters build - version = "0.67.0"; + version = "0.73.0"; mkFlag = optset: flag: "-DENABLE_${flag}=${if optset then "on" else "off"}"; in stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/poppler-${version}.tar.xz"; - sha256 = "1yb6agmcxf0ixqm65d4aknl0hgmswf94x0k59ic0qqav1wd4yjm3"; + sha256 = "00yv7011y40jc5iw9b7zjyg8ij5wsfbjm32kli5qha1ij11majz4"; }; outputs = [ "out" "dev" ]; @@ -33,11 +33,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ninja pkgconfig ]; - # Not sure when and how to pass it. It seems an upstream bug anyway. - CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11"; + # Workaround #54606 + preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' + sed -i -e '1i cmake_policy(SET CMP0025 NEW)' CMakeLists.txt + ''; cmakeFlags = [ - (mkFlag true "XPDF_HEADERS") + (mkFlag true "UNSTABLE_API_ABI_HEADERS") # previously "XPDF_HEADERS" (mkFlag (!minimal) "GLIB") (mkFlag (!minimal) "CPP") (mkFlag (!minimal) "LIBCURL") |