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

Revert "poppler: 0.79.0 -> 0.81.0" 

Reverting because this breaks texlive.bin.

This reverts commit 192e73f7a1.
This commit is contained in:
Frederik Rietdijk 2019-10-20 17:02:48 +02:00
parent f849554226
commit 5118f12a07
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,7 +8,7 @@
}: }:
let # beware: updates often break cups-filters build let # beware: updates often break cups-filters build
version = "0.81.0"; version = "0.79.0";
mkFlag = optset: flag: "-DENABLE_${flag}=${if optset then "on" else "off"}"; mkFlag = optset: flag: "-DENABLE_${flag}=${if optset then "on" else "off"}";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -16,11 +16,19 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "${meta.homepage}/poppler-${version}.tar.xz"; url = "${meta.homepage}/poppler-${version}.tar.xz";
sha256 = "00pykc7nym3xg0wc60awv0i35zwdfyn0igb6jrnb6rsv0c5h4b91"; sha256 = "1j18jlv1q6h21azb939gqjsgcbsh5qcd8dwxdmad54p5ixha91gr";
}; };
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
patches = [
(fetchpatch {
name = "CVE-2019-9959.patch";
url = "https://gitlab.freedesktop.org/poppler/poppler/commit/68ef84e5968a4249c2162b839ca6d7975048a557.patch";
sha256 = "17a3qs74fnnrhjys23f4aw5y7yfsk5d507jcj4hh1bndqv6dpwg1";
})
];
buildInputs = [ libiconv libintl ] ++ lib.optional withData poppler_data; buildInputs = [ libiconv libintl ] ++ lib.optional withData poppler_data;
# TODO: reduce propagation to necessary libs # TODO: reduce propagation to necessary libs