diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-12-01 19:00:09 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-12-01 19:00:09 +0100 |
| commit | 9e9b07490d5bab5d115c66b80bdb10ff0c11ed8d (patch) | |
| tree | 4368f9e4cb2d5b93a956c085337e45cb70f1e331 /nixpkgs/pkgs/development/libraries/gtk | |
| parent | a9cbfb6941b47d6f50129e6e36927882392daed7 (diff) | |
| parent | 2344fe1da14cb08b0c18743b207995f9b8597915 (diff) | |
| download | nixlib-9e9b07490d5bab5d115c66b80bdb10ff0c11ed8d.tar nixlib-9e9b07490d5bab5d115c66b80bdb10ff0c11ed8d.tar.gz nixlib-9e9b07490d5bab5d115c66b80bdb10ff0c11ed8d.tar.bz2 nixlib-9e9b07490d5bab5d115c66b80bdb10ff0c11ed8d.tar.lz nixlib-9e9b07490d5bab5d115c66b80bdb10ff0c11ed8d.tar.xz nixlib-9e9b07490d5bab5d115c66b80bdb10ff0c11ed8d.tar.zst nixlib-9e9b07490d5bab5d115c66b80bdb10ff0c11ed8d.zip | |
Merge https://github.com/NixOS/nixpkgs
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/gtk')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/gtk/4.x.nix | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/nixpkgs/pkgs/development/libraries/gtk/4.x.nix b/nixpkgs/pkgs/development/libraries/gtk/4.x.nix index 0503ac199f90..218efb6559fb 100644 --- a/nixpkgs/pkgs/development/libraries/gtk/4.x.nix +++ b/nixpkgs/pkgs/development/libraries/gtk/4.x.nix @@ -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.3"; 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 = "FIziYvbIZIdFX7HZeTw/WLw+HaR3opYX+tsEIPWHCok="; }; patches = [ # https://github.com/NixOS/nixpkgs/pull/218143#issuecomment-1501059486 ./patches/4.0-fix-darwin-build.patch + + # gdk: Fix compilation on macos + # https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/6208 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gtk/-/commit/aa888c0b3f775776fe3b71028396b7a8c6adb1d6.patch"; + sha256 = "sha256-Jw6BvWDX0wIs4blUiX3qdQCR574yhcaO06Vy/IqfbJo="; + }) ]; 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 |