ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-21 20:49:52 +03:00
Code Issues Projects Releases Wiki Activity

gtk4: 4.10.4 → 4.12.0

Browse Source 
https://gitlab.gnome.org/GNOME/gtk/-/compare/4.10.4...4.12.0

New build-aux/meson/gen-visibility-macros.py:

4d1f7a476d

docs build options renamed:

6af55a31d7

Changelog-reviewed-by: Bobby Rong <rjl931189261@126.com>
Changelog-reviewed-by: Jan Tojnar <jtojnar@gmail.com>
This commit is contained in:
Bobby Rong 2023-08-07 07:57:29 +00:00 committed by Jan Tojnar
parent 072bc21c14
commit abd07af525
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/development/libraries/gtk/4.x.nix
View File

@ -3,6 +3,7 @@
, buildPackages
, substituteAll
, fetchurl
, fetchpatch
, pkg-config
, gettext
, graphene
@ -40,6 +41,7 @@
, libGL
# experimental and can cause crashes in inspector
, vulkanSupport ? false
, shaderc
, vulkan-loader
, vulkan-headers
, wayland
@ -67,7 +69,7 @@ in
stdenv.mkDerivation rec {
pname = "gtk4";
version = "4.10.4";
version = "4.12.0";
outputs = [ "out" "dev" ] ++ lib.optionals x11Support [ "devdoc" ];
outputBin = "dev";
@ -79,12 +81,19 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnome/sources/gtk/${lib.versions.majorMinor version}/gtk-${version}.tar.xz";
sha256 = "dyVABILgaF4oJl4ibGKEf05zz8qem0FqxYOCB/U3eiQ=";
sha256 = "ptEIKfQFsa/Atl4qlkLAQSah0bY40Rxtl0JtpPhPH28=";
};
patches = [
# https://github.com/NixOS/nixpkgs/pull/218143#issuecomment-1501059486
./patches/4.0-fix-darwin-build.patch
# Fixes "undefined symbol: gtk_printer_option_set"
# https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/6250
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/gtk/-/commit/4d7277f72c8f4915f237e36982ffd7dfba524b15.patch";
sha256 = "nLNvrfrgF/Ssr2XUQDV8Qbszw5OUA4CnkZ6okrSlzOc=";
})
];
depsBuildBuild = [
@ -106,6 +115,8 @@ stdenv.mkDerivation rec {
mesonEmulatorHook
] ++ lib.optionals waylandSupport [
wayland-scanner
] ++ lib.optionals vulkanSupport [
shaderc # for glslc
] ++ setupHooks;
buildInputs = [
@ -168,7 +179,7 @@ stdenv.mkDerivation rec {
mesonFlags = [
# ../docs/tools/shooter.c:4:10: fatal error: 'cairo-xlib.h' file not found
"-Dgtk_doc=${lib.boolToString x11Support}"
"-Ddocumentation=${lib.boolToString x11Support}"
"-Dbuild-tests=false"
"-Dtracker=${if trackerSupport then "enabled" else "disabled"}"
"-Dbroadway-backend=${lib.boolToString broadwaySupport}"
@ -201,6 +212,7 @@ stdenv.mkDerivation rec {
files=(
build-aux/meson/gen-demo-header.py
build-aux/meson/gen-visibility-macros.py
demos/gtk-demo/geninclude.py
gdk/broadway/gen-c-array.py
gdk/gen-gdk-gresources-xml.py