diff options
| author | Robert Scott <code@humanleg.org.uk> | 2021-08-01 16:25:52 +0100 |
|---|---|---|
| committer | Robert Scott <code@humanleg.org.uk> | 2021-08-02 19:28:26 +0100 |
| commit | f13ed324902308e118475c08128c22e91cde982b (patch) | |
| tree | a365993fe25ac75a048e4e03c4b630d84b707040 /pkgs/desktops/gnome | |
| parent | fd6fc2cae2fe8b04c5b29eef6e65c8606b00193f (diff) | |
| download | nixpkgs-f13ed324902308e118475c08128c22e91cde982b.tar nixpkgs-f13ed324902308e118475c08128c22e91cde982b.tar.gz nixpkgs-f13ed324902308e118475c08128c22e91cde982b.tar.bz2 nixpkgs-f13ed324902308e118475c08128c22e91cde982b.tar.lz nixpkgs-f13ed324902308e118475c08128c22e91cde982b.tar.xz nixpkgs-f13ed324902308e118475c08128c22e91cde982b.tar.zst nixpkgs-f13ed324902308e118475c08128c22e91cde982b.zip | |
gnome.caribou: add patch for CVE-2021-3567
adding vala requirement as patching triggers a rerun on valac, also needing a fix for semi-modern vala support
Diffstat (limited to 'pkgs/desktops/gnome')
| -rw-r--r-- | pkgs/desktops/gnome/core/caribou/default.nix | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/pkgs/desktops/gnome/core/caribou/default.nix b/pkgs/desktops/gnome/core/caribou/default.nix index 5985ff82266..50fb1c3de56 100644 --- a/pkgs/desktops/gnome/core/caribou/default.nix +++ b/pkgs/desktops/gnome/core/caribou/default.nix @@ -1,6 +1,6 @@ { fetchurl, lib, stdenv, pkg-config, gnome, glib, gtk3, clutter, dbus, python3, libxml2 , libxklavier, libXtst, gtk2, intltool, libxslt, at-spi2-core, autoreconfHook -, wrapGAppsHook, libgee }: +, wrapGAppsHook, libgee, vala_0_40 }: let pname = "caribou"; @@ -21,9 +21,19 @@ in stdenv.mkDerivation rec { url = "https://bugzilla.gnome.org/attachment.cgi?id=364774"; sha256 = "15k1455grf6knlrxqbjnk7sals1730b0whj30451scp46wyvykvd"; }) + (fetchurl { + name = "fix-build-modern-vala.patch"; + url = "https://gitlab.gnome.org/GNOME/caribou/-/commit/76fbd11575f918fc898cb0f5defe07f67c11ec38.patch"; + sha256 = "0qy27zk7889hg51nx40afgppcx9iaihxbg3aqz9w35d6fmhr2k2y"; + }) + (fetchurl { + name = "CVE-2021-3567.patch"; + url = "https://gitlab.gnome.org/GNOME/caribou/-/commit/d41c8e44b12222a290eaca16703406b113a630c6.patch"; + sha256 = "1vd2j3823k2p3msv7fq2437p3jvxzbd7hyh07i80g9754ylh92y8"; + }) ]; - nativeBuildInputs = [ pkg-config intltool libxslt libxml2 autoreconfHook wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config intltool libxslt libxml2 autoreconfHook wrapGAppsHook vala_0_40 ]; buildInputs = [ glib gtk3 clutter at-spi2-core dbus pythonEnv python3.pkgs.pygobject3 |