diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2023-11-04 15:02:28 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-11-04 15:02:28 +0100 |
commit | cc054557b1c529d74ec6ccc44cacd401132a7ac9 (patch) | |
tree | 384f48d431431284b06b743c1cd8a1a6f5ccdc13 /pkgs/development/libraries | |
parent | 5ae713a2e4d40bdac6e240031f691dc157ee8e03 (diff) | |
parent | 2eb4da810ff71af2d236e7b5d21a6042faa0405d (diff) | |
download | nixlib-cc054557b1c529d74ec6ccc44cacd401132a7ac9.tar nixlib-cc054557b1c529d74ec6ccc44cacd401132a7ac9.tar.gz nixlib-cc054557b1c529d74ec6ccc44cacd401132a7ac9.tar.bz2 nixlib-cc054557b1c529d74ec6ccc44cacd401132a7ac9.tar.lz nixlib-cc054557b1c529d74ec6ccc44cacd401132a7ac9.tar.xz nixlib-cc054557b1c529d74ec6ccc44cacd401132a7ac9.tar.zst nixlib-cc054557b1c529d74ec6ccc44cacd401132a7ac9.zip |
Merge pull request #264817 from 6t8k/poppler_23.08.0-23.10.0
poppler: 23.08.0 -> 23.11.0
Diffstat (limited to 'pkgs/development/libraries')
-rw-r--r-- | pkgs/development/libraries/poppler/default.nix | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index 3774a3e05dcf..25a26e7fd2c6 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -25,6 +25,7 @@ , withData ? true, poppler_data , qt5Support ? false, qt6Support ? false, qtbase ? null , introspectionSupport ? false, gobject-introspection ? null +, gpgmeSupport ? false, gpgme ? null , utils ? false, nss ? null , minimal ? false , suffix ? "glib" @@ -47,13 +48,13 @@ let in stdenv.mkDerivation (finalAttrs: rec { pname = "poppler-${suffix}"; - version = "23.08.0"; # beware: updates often break cups-filters build, check texlive and scribus too! + version = "23.11.0"; # beware: updates often break cups-filters build, check scribus too! outputs = [ "out" "dev" ]; src = fetchurl { url = "https://poppler.freedesktop.org/poppler-${version}.tar.xz"; - hash = "sha256-Skv3/JA7nxoqt9BLfF2CINubxiYcxz/bmoJtwnL0mqg="; + hash = "sha256-+ZzKZ5nLnLbJL8Hg63hUe2EctzN1CrfLBHyw5sJGU5w="; }; nativeBuildInputs = [ @@ -88,6 +89,8 @@ stdenv.mkDerivation (finalAttrs: rec { qtbase ] ++ lib.optionals introspectionSupport [ gobject-introspection + ] ++ lib.optionals gpgmeSupport [ + gpgme ]; cmakeFlags = [ @@ -95,9 +98,13 @@ stdenv.mkDerivation (finalAttrs: rec { (mkFlag (!minimal) "GLIB") (mkFlag (!minimal) "CPP") (mkFlag (!minimal) "LIBCURL") + (mkFlag (!minimal) "LCMS") + (mkFlag (!minimal) "LIBTIFF") + (mkFlag (!minimal) "NSS3") (mkFlag utils "UTILS") (mkFlag qt5Support "QT5") (mkFlag qt6Support "QT6") + (mkFlag gpgmeSupport "GPGME") ] ++ lib.optionals finalAttrs.doCheck [ "-DTESTDATADIR=${testData}" ]; @@ -110,13 +117,24 @@ stdenv.mkDerivation (finalAttrs: rec { sed -i -e '1i cmake_policy(SET CMP0025 NEW)' CMakeLists.txt ''; + # Work around gpgme trying to write to $HOME during qt5 and qt6 tests: + preCheck = lib.optionalString gpgmeSupport '' + HOME_orig="$HOME" + export HOME="$(mktemp -d)" + ''; + + postCheck = lib.optionalString gpgmeSupport '' + export HOME="$HOME_orig" + unset -v HOME_orig + ''; + doCheck = true; passthru = { inherit testData; tests = { # These depend on internal poppler code that frequently changes. - inherit inkscape cups-filters texlive scribus; + inherit inkscape cups-filters scribus; }; }; |