diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2018-01-08 17:33:31 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2018-01-08 17:33:31 +0100 |
| commit | 5837d1a0704779928487687ada02cecbdf5b4603 (patch) | |
| tree | 4d5971e50c2a24ff3eac39e2e67e303af3daee97 /pkgs/desktops/gnome-3 | |
| parent | bfb1db7a751879c83eabe823b767a71924a45bc5 (diff) | |
| parent | ad26bfd316d03236181774a0245ab874703e24bd (diff) | |
| download | nixlib-5837d1a0704779928487687ada02cecbdf5b4603.tar nixlib-5837d1a0704779928487687ada02cecbdf5b4603.tar.gz nixlib-5837d1a0704779928487687ada02cecbdf5b4603.tar.bz2 nixlib-5837d1a0704779928487687ada02cecbdf5b4603.tar.lz nixlib-5837d1a0704779928487687ada02cecbdf5b4603.tar.xz nixlib-5837d1a0704779928487687ada02cecbdf5b4603.tar.zst nixlib-5837d1a0704779928487687ada02cecbdf5b4603.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/desktops/gnome-3')
| -rw-r--r-- | pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/desktops/gnome-3/core/libcroco/default.nix | 15 |
2 files changed, 17 insertions, 3 deletions
diff --git a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix index 5986b07229f5..4e0e6ecb997d 100644 --- a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix @@ -1,6 +1,6 @@ { stdenv, gettext, libxml2, fetchurl, pkgconfig, libcanberra_gtk3 , bash, gtk3, glib, meson, ninja, wrapGAppsHook, appstream-glib -, gnome3, librsvg, gdk_pixbuf }: +, gnome3, librsvg, gdk_pixbuf, gobjectIntrospection }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ]; - nativeBuildInputs = [ meson ninja pkgconfig gettext appstream-glib libxml2 wrapGAppsHook ]; + nativeBuildInputs = [ meson ninja pkgconfig gettext appstream-glib libxml2 + wrapGAppsHook gobjectIntrospection ]; buildInputs = [ bash gtk3 glib libcanberra_gtk3 gnome3.gsettings_desktop_schemas ]; diff --git a/pkgs/desktops/gnome-3/core/libcroco/default.nix b/pkgs/desktops/gnome-3/core/libcroco/default.nix index 4141afeb821d..744ec3c2fe62 100644 --- a/pkgs/desktops/gnome-3/core/libcroco/default.nix +++ b/pkgs/desktops/gnome-3/core/libcroco/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, glib }: +{ stdenv, fetchurl, pkgconfig, libxml2, glib, fetchpatch }: stdenv.mkDerivation rec { name = "libcroco-0.6.12"; @@ -8,6 +8,19 @@ stdenv.mkDerivation rec { sha256 = "0q7qhi7z64i26zabg9dbs5706fa8pmzp1qhpa052id4zdiabbi6x"; }; + patches = [ + (fetchpatch { + name = "CVE-2017-7960.patch"; + url = "https://git.gnome.org/browse/libcroco/patch/?id=898e3a8c8c0314d2e6b106809a8e3e93cf9d4394"; + sha256 = "1xjwdqijxf4b7mhdp3kkgnb6c14y0bn3b3gg79kyrm82x696d94l"; + }) + (fetchpatch { + name = "CVE-2017-7961.patch"; + url = "https://git.gnome.org/browse/libcroco/patch/?id=9ad72875e9f08e4c519ef63d44cdbd94aa9504f7"; + sha256 = "0zakd72ynzjgzskwyvqglqiznsb93j1bkvc1lgyrzgv9rwrbwv9s"; + }) + ]; + outputs = [ "out" "dev" ]; outputBin = "dev"; |