diff options
| author | Andreas Rammhold <andreas@rammhold.de> | 2018-10-15 23:55:47 +0200 |
|---|---|---|
| committer | Andreas Rammhold <andreas@rammhold.de> | 2018-10-26 12:17:58 +0200 |
| commit | 6ad3088b124504c873e239002b044e4b66607986 (patch) | |
| tree | add90bf6e08e60d6a594cdb7647f92051c3db4f8 /pkgs/desktops | |
| parent | 5f75f72497113001bbd464018db233fee13b0ed9 (diff) | |
| download | nixlib-6ad3088b124504c873e239002b044e4b66607986.tar nixlib-6ad3088b124504c873e239002b044e4b66607986.tar.gz nixlib-6ad3088b124504c873e239002b044e4b66607986.tar.bz2 nixlib-6ad3088b124504c873e239002b044e4b66607986.tar.lz nixlib-6ad3088b124504c873e239002b044e4b66607986.tar.xz nixlib-6ad3088b124504c873e239002b044e4b66607986.tar.zst nixlib-6ad3088b124504c873e239002b044e4b66607986.zip | |
libgxps: fix CVE-2018-10733
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/gnome-3/core/libgxps/default.nix | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/pkgs/desktops/gnome-3/core/libgxps/default.nix b/pkgs/desktops/gnome-3/core/libgxps/default.nix index c9312c228829..68193bad5833 100644 --- a/pkgs/desktops/gnome-3/core/libgxps/default.nix +++ b/pkgs/desktops/gnome-3/core/libgxps/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, glib, gobjectIntrospection, cairo -, libarchive, freetype, libjpeg, libtiff, gnome3 +, libarchive, freetype, libjpeg, libtiff, gnome3, fetchpatch }: let @@ -13,6 +13,19 @@ in stdenv.mkDerivation rec { sha256 = "412b1343bd31fee41f7204c47514d34c563ae34dafa4cc710897366bd6cd0fae"; }; + patches = [ + (fetchpatch { + name = "CVE-2018-10733-1.patch"; + url = https://gitlab.gnome.org/GNOME/libgxps/commit/b458226e162fe1ffe7acb4230c114a52ada5131b.patch; + sha256 = "0pqg9iwkg69qknj7vkgn26c32fndy55byxivd4km0vjfhfyx69hd"; + }) + (fetchpatch { + name = "CVE-2018-10733-2.patch"; + url = https://gitlab.gnome.org/GNOME/libgxps/commit/133fe2a96e020d4ca65c6f64fb28a404050ebbfd.patch; + sha256 = "19n01x8zs05wf801mkz4mypvapph7h941md3hr3rj0ry6r88pkir"; + }) + ]; + nativeBuildInputs = [ meson ninja pkgconfig gobjectIntrospection ]; buildInputs = [ glib cairo freetype libjpeg libtiff ]; propagatedBuildInputs = [ libarchive ]; |