summary refs log tree commit diff
path: root/pkgs/development/libraries/gtk
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2021-12-31 14:43:06 +0000
committerJan Tojnar <jtojnar@gmail.com>2022-01-01 23:07:52 +0100
commit78ef5c72c26a02bcbf4dc012b8fe3dbd42d559c0 (patch)
treef4cde2f1c352277f713ee11db4646984fb440cea /pkgs/development/libraries/gtk
parent62e6374d5e1cecfdedd702592f09bdbb87249e5d (diff)
downloadnixpkgs-78ef5c72c26a02bcbf4dc012b8fe3dbd42d559c0.tar
nixpkgs-78ef5c72c26a02bcbf4dc012b8fe3dbd42d559c0.tar.gz
nixpkgs-78ef5c72c26a02bcbf4dc012b8fe3dbd42d559c0.tar.bz2
nixpkgs-78ef5c72c26a02bcbf4dc012b8fe3dbd42d559c0.tar.lz
nixpkgs-78ef5c72c26a02bcbf4dc012b8fe3dbd42d559c0.tar.xz
nixpkgs-78ef5c72c26a02bcbf4dc012b8fe3dbd42d559c0.tar.zst
nixpkgs-78ef5c72c26a02bcbf4dc012b8fe3dbd42d559c0.zip
gtk4: 4.4.1 → 4.6.0
https://gitlab.gnome.org/GNOME/gtk/-/blob/4.6.0/NEWS#L1-248
Diffstat (limited to 'pkgs/development/libraries/gtk')
-rw-r--r--pkgs/development/libraries/gtk/4.x.nix16
1 files changed, 12 insertions, 4 deletions
diff --git a/pkgs/development/libraries/gtk/4.x.nix b/pkgs/development/libraries/gtk/4.x.nix
index d763c99882e..99e3b9e969a 100644
--- a/pkgs/development/libraries/gtk/4.x.nix
+++ b/pkgs/development/libraries/gtk/4.x.nix
@@ -6,7 +6,7 @@
 , gettext
 , graphene
 , gi-docgen
-, meson
+, meson_0_60
 , ninja
 , python3
 , makeWrapper
@@ -23,6 +23,9 @@
 , xorg
 , libepoxy
 , libxkbcommon
+, libpng
+, libtiff
+, libjpeg
 , libxml2
 , gnome
 , gsettings-desktop-schemas
@@ -59,7 +62,7 @@ in
 
 stdenv.mkDerivation rec {
   pname = "gtk4";
-  version = "4.4.1";
+  version = "4.6.0";
 
   outputs = [ "out" "dev" ] ++ lib.optionals x11Support [ "devdoc" ];
   outputBin = "dev";
@@ -71,14 +74,14 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/gtk/${lib.versions.majorMinor version}/gtk-${version}.tar.xz";
-    sha256 = "D6ramD3GsLxAnLNMFxPB8yZ+Z8CT+GseOxfbYQCj3fQ=";
+    sha256 = "eC1ZUfv9WF/J7HbAnQfijmAUxy2wAftWf/8hf7luTYw=";
   };
 
   nativeBuildInputs = [
     gettext
     gobject-introspection
     makeWrapper
-    meson
+    meson_0_60
     ninja
     pkg-config
     python3
@@ -89,6 +92,9 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     libxkbcommon
+    libpng
+    libtiff
+    libjpeg
     libepoxy
     isocodes
   ] ++ lib.optionals vulkanSupport [
@@ -130,6 +136,8 @@ stdenv.mkDerivation rec {
     glib
     graphene
     pango
+  ] ++ lib.optionals waylandSupport [
+    wayland
   ] ++ lib.optionals vulkanSupport [
     vulkan-loader
   ] ++ [