diff options
| author | Robert Scott <code@humanleg.org.uk> | 2019-10-12 18:34:13 +0100 |
|---|---|---|
| committer | Robert Scott <code@humanleg.org.uk> | 2019-10-13 16:57:10 +0100 |
| commit | 3fa2864aac8f48c9f4f7bfc5ae353594fad36b24 (patch) | |
| tree | 341f16e68f7ccd92ab524a770351adc2c10876b3 /pkgs/development/libraries/poppler | |
| parent | 3ba2580d4cf8ba81d09325da8a89086bae754b75 (diff) | |
| download | nixpkgs-3fa2864aac8f48c9f4f7bfc5ae353594fad36b24.tar nixpkgs-3fa2864aac8f48c9f4f7bfc5ae353594fad36b24.tar.gz nixpkgs-3fa2864aac8f48c9f4f7bfc5ae353594fad36b24.tar.bz2 nixpkgs-3fa2864aac8f48c9f4f7bfc5ae353594fad36b24.tar.lz nixpkgs-3fa2864aac8f48c9f4f7bfc5ae353594fad36b24.tar.xz nixpkgs-3fa2864aac8f48c9f4f7bfc5ae353594fad36b24.tar.zst nixpkgs-3fa2864aac8f48c9f4f7bfc5ae353594fad36b24.zip | |
poppler: add patch for CVE-2019-9959
Diffstat (limited to 'pkgs/development/libraries/poppler')
| -rw-r--r-- | pkgs/development/libraries/poppler/default.nix | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index 28408cb91f8..523e372996b 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, cmake, ninja, pkgconfig, libiconv, libintl +{ stdenv, lib, fetchurl, fetchpatch, cmake, ninja, pkgconfig, libiconv, libintl , zlib, curl, cairo, freetype, fontconfig, lcms, libjpeg, openjpeg , withData ? true, poppler_data , qt5Support ? false, qtbase ? null @@ -21,6 +21,14 @@ stdenv.mkDerivation rec { 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; # TODO: reduce propagation to necessary libs |