diff options
Diffstat (limited to 'pkgs/development/libraries/gtk/4.x.nix')
| -rw-r--r-- | pkgs/development/libraries/gtk/4.x.nix | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/pkgs/development/libraries/gtk/4.x.nix b/pkgs/development/libraries/gtk/4.x.nix index 036d1ab0d49d0..34a5582ffa676 100644 --- a/pkgs/development/libraries/gtk/4.x.nix +++ b/pkgs/development/libraries/gtk/4.x.nix @@ -39,10 +39,11 @@ , waylandSupport ? stdenv.isLinux , libGL # experimental and can cause crashes in inspector -, vulkanSupport ? false +, vulkanSupport ? stdenv.isLinux , shaderc , vulkan-loader , vulkan-headers +, libdrm , wayland , wayland-protocols , wayland-scanner @@ -69,7 +70,7 @@ in stdenv.mkDerivation (finalAttrs: { pname = "gtk4"; - version = "4.12.5"; + version = "4.14.3"; outputs = [ "out" "dev" ] ++ lib.optionals x11Support [ "devdoc" ]; outputBin = "dev"; @@ -81,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = with finalAttrs; "mirror://gnome/sources/gtk/${lib.versions.majorMinor version}/gtk-${version}.tar.xz"; - sha256 = "KLNW1ZDuaO9ibi75ggst0hRBSEqaBCpaPwxA6d/E9Pg="; + hash = "sha256-K+XIWL3vEQTTeEjJd5wIk3LI0xUD9u/EuU5TtUb8mkM="; }; depsBuildBuild = [ @@ -116,6 +117,7 @@ stdenv.mkDerivation (finalAttrs: { isocodes ] ++ lib.optionals vulkanSupport [ vulkan-headers + libdrm ] ++ [ gst_all_1.gst-plugins-base gst_all_1.gst-plugins-bad @@ -161,24 +163,21 @@ stdenv.mkDerivation (finalAttrs: { vulkan-loader ] ++ [ # Required for GSettings schemas at runtime. - # Will be picked up by wrapGAppsHook. + # Will be picked up by wrapGAppsHook4. gsettings-desktop-schemas ]; mesonFlags = [ # ../docs/tools/shooter.c:4:10: fatal error: 'cairo-xlib.h' file not found - "-Ddocumentation=${lib.boolToString x11Support}" + (lib.mesonBool "documentation" x11Support) "-Dbuild-tests=false" - "-Dtracker=${if trackerSupport then "enabled" else "disabled"}" - "-Dbroadway-backend=${lib.boolToString broadwaySupport}" - ] ++ lib.optionals vulkanSupport [ - "-Dvulkan=enabled" - ] ++ lib.optionals (!cupsSupport) [ - "-Dprint-cups=disabled" + (lib.mesonEnable "tracker" trackerSupport) + (lib.mesonBool "broadway-backend" broadwaySupport) + (lib.mesonEnable "vulkan" vulkanSupport) + (lib.mesonEnable "print-cups" cupsSupport) + (lib.mesonBool "x11-backend" x11Support) ] ++ lib.optionals (stdenv.isDarwin && !stdenv.isAarch64) [ "-Dmedia-gstreamer=disabled" # requires gstreamer-gl - ] ++ lib.optionals (!x11Support) [ - "-Dx11-backend=false" ]; doCheck = false; # needs X11 @@ -199,7 +198,7 @@ stdenv.mkDerivation (finalAttrs: { --replace 'if not meson.is_cross_build()' 'if ${lib.boolToString compileSchemas}' files=( - build-aux/meson/gen-demo-header.py + build-aux/meson/gen-profile-conf.py build-aux/meson/gen-visibility-macros.py demos/gtk-demo/geninclude.py gdk/broadway/gen-c-array.py |