diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2022-12-04 00:27:46 +0000 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2022-12-05 19:00:19 +0100 |
| commit | c4f9092cfe802af5bb0748070785a835e1e0ecac (patch) | |
| tree | 835f99a26101e1042adb4c6a7b4264b6564328ab /pkgs/development/libraries/gtk/3.x.nix | |
| parent | 26c6895e1005b3e4f6dfe0d16afbd1f12d0a054c (diff) | |
| download | nixpkgs-c4f9092cfe802af5bb0748070785a835e1e0ecac.tar nixpkgs-c4f9092cfe802af5bb0748070785a835e1e0ecac.tar.gz nixpkgs-c4f9092cfe802af5bb0748070785a835e1e0ecac.tar.bz2 nixpkgs-c4f9092cfe802af5bb0748070785a835e1e0ecac.tar.lz nixpkgs-c4f9092cfe802af5bb0748070785a835e1e0ecac.tar.xz nixpkgs-c4f9092cfe802af5bb0748070785a835e1e0ecac.tar.zst nixpkgs-c4f9092cfe802af5bb0748070785a835e1e0ecac.zip | |
gtk3: 3.24.34 → 3.24.35
https://gitlab.gnome.org/GNOME/gtk/-/compare/3.24.34...3.24.35 Changelog-Reviewed-By: Jan Tojnar <jtojnar@gmail.com>
Diffstat (limited to 'pkgs/development/libraries/gtk/3.x.nix')
| -rw-r--r-- | pkgs/development/libraries/gtk/3.x.nix | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix index c06aa946993..282486dc88d 100644 --- a/pkgs/development/libraries/gtk/3.x.nix +++ b/pkgs/development/libraries/gtk/3.x.nix @@ -2,6 +2,7 @@ , stdenv , substituteAll , fetchurl +, fetchpatch2 , pkg-config , gettext , docbook-xsl-nons @@ -60,7 +61,7 @@ in stdenv.mkDerivation rec { pname = "gtk+3"; - version = "3.24.34"; + version = "3.24.35"; outputs = [ "out" "dev" ] ++ lib.optional withGtkDoc "devdoc"; outputBin = "dev"; @@ -72,12 +73,22 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gtk+/${lib.versions.majorMinor version}/gtk+-${version}.tar.xz"; - sha256 = "sha256-28afkN3IIbjRRB8AN03B2kMjour6kHjmHtvl7u+oUuw="; + sha256 = "sha256-7BD+bXEu8LPGO1+TJjnJ0a6Z/OlPUA9vBpZWKf72C9E="; }; patches = [ ./patches/3.0-immodules.cache.patch ./patches/3.0-Xft-setting-fallback-compute-DPI-properly.patch + + # Add accidentally non-dist’d build file. + # https://gitlab.gnome.org/GNOME/gtk/-/commit/b2ad8d2abafbd94c7e58e5e1b98c92e6b6fa6d9a + (fetchpatch2 { + url = "https://gitlab.gnome.org/GNOME/gtk/-/commit/66a199806ceb3daa5e2c7d3a5b45a86007cec46a.patch"; + includes = [ + "gdk/wayland/cursor/meson.build" + ]; + sha256 = "cOOcSB3yphff2+7l7YpFbGSswWjV8lJ2tk+Vjgl1ras="; + }) ] ++ lib.optionals stdenv.isDarwin [ # X11 module requires <gio/gdesktopappinfo.h> which is not installed on Darwin # let’s drop that dependency in similar way to how other parts of the library do it |