diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2018-02-02 23:48:04 +0100 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2018-02-03 00:43:48 +0100 |
commit | 10a4edb927ea9abee6dd952b2335649d6786ef29 (patch) | |
tree | 6d30eb8c99286dcd704ddb3a734f5349cd70fbe4 | |
parent | 1f6bdeaa97b14ec5b282182c9ff39bc7dc472e9e (diff) | |
download | nixlib-10a4edb927ea9abee6dd952b2335649d6786ef29.tar nixlib-10a4edb927ea9abee6dd952b2335649d6786ef29.tar.gz nixlib-10a4edb927ea9abee6dd952b2335649d6786ef29.tar.bz2 nixlib-10a4edb927ea9abee6dd952b2335649d6786ef29.tar.lz nixlib-10a4edb927ea9abee6dd952b2335649d6786ef29.tar.xz nixlib-10a4edb927ea9abee6dd952b2335649d6786ef29.tar.zst nixlib-10a4edb927ea9abee6dd952b2335649d6786ef29.zip |
poppler_qt4: downgrade 0.62.0 → 0.61.1
Poppler 0.62 removes QT4 support. We would drop it but unfortunately, some things still rely on it.
-rw-r--r-- | pkgs/development/libraries/poppler/qt4.nix | 44 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
2 files changed, 45 insertions, 4 deletions
diff --git a/pkgs/development/libraries/poppler/qt4.nix b/pkgs/development/libraries/poppler/qt4.nix new file mode 100644 index 000000000000..c82a543413e2 --- /dev/null +++ b/pkgs/development/libraries/poppler/qt4.nix @@ -0,0 +1,44 @@ +# TODO: get rid of this (https://github.com/NixOS/nixpkgs/issues/32883) +{ stdenv, lib, fetchurl, cmake, ninja, pkgconfig, libiconv, libintlOrEmpty +, zlib, curl, cairo, freetype, fontconfig, lcms2, libjpeg, openjpeg +, poppler_data, qt4 +}: + +let + # Last version supporting QT4 + version = "0.61.1"; +in +stdenv.mkDerivation rec { + name = "poppler-qt4-${version}"; + + src = fetchurl { + url = "${meta.homepage}/poppler-${version}.tar.xz"; + sha256 = "1afdrxxkaivvviazxkg5blsf2x24sjkfj92ib0d3q5pm8dihjrhj"; + }; + + outputs = [ "out" "dev" ]; + + buildInputs = [ libiconv poppler_data ] ++ libintlOrEmpty; + + propagatedBuildInputs = [ zlib freetype fontconfig libjpeg openjpeg cairo lcms2 curl qt4 ]; + + nativeBuildInputs = [ cmake ninja pkgconfig ]; + + cmakeFlags = [ + "-DENABLE_XPDF_HEADERS=on" + "-DENABLE_UTILS=off" + ]; + + meta = with lib; { + homepage = https://poppler.freedesktop.org/; + description = "A PDF rendering library"; + + longDescription = '' + Poppler is a PDF rendering library based on the xpdf-3.0 code base. + ''; + + license = licenses.gpl2; + platforms = platforms.all; + maintainers = with maintainers; [ ttuegel ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 84b01ae94222..0dfcda448847 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10573,10 +10573,7 @@ with pkgs; suffix = "min"; }; - poppler_qt4 = poppler.override { - qt4Support = true; - suffix = "qt4"; - }; + poppler_qt4 = callPackage ../development/libraries/poppler/qt4.nix { }; poppler_utils = poppler.override { suffix = "utils"; utils = true; }; |