dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge #328255: gtk2: apply patch fixing CVE-2024-6655

Browse Source 
...into staging
This commit is contained in:
Vladimír Čunát 2024-07-20 08:59:13 +02:00
commit 666ea4fd7c
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/libraries/gtk/2.x.nix
View File

@ -2,6 +2,7 @@
, lib , lib
, stdenv , stdenv
, fetchurl , fetchurl
, fetchpatch
, atk , atk
, buildPackages , buildPackages
, cairo , cairo
@ -63,6 +64,12 @@ stdenv.mkDerivation (finalAttrs: {
patches = [ patches = [
./patches/2.0-immodules.cache.patch ./patches/2.0-immodules.cache.patch
./patches/gtk2-theme-paths.patch ./patches/gtk2-theme-paths.patch
(fetchpatch {
# https://gitlab.gnome.org/GNOME/gtk/-/issues/6786
name = "CVE-2024-6655.patch";
url = "https://gitlab.gnome.org/GNOME/gtk/-/commit/3bbf0b6176d42836d23c36a6ac410e807ec0a7a7.patch";
hash = "sha256-mstOPk9NNpUwScrdEbvGhmAv8jlds3SBdj53T0q33vM=";
})
] ++ lib.optionals stdenv.isDarwin [ ] ++ lib.optionals stdenv.isDarwin [
./patches/2.0-gnome_bugzilla_557780_306776_freeciv_darwin.patch ./patches/2.0-gnome_bugzilla_557780_306776_freeciv_darwin.patch
./patches/2.0-darwin-x11.patch ./patches/2.0-darwin-x11.patch