mesa-demos: 8.5.0 -> 9.0.0

Now with vkgears!

pkgs/tools/graphics/mesa-demos/default.nix

@@ -1,29 +1,20 @@
-{ lib, stdenv, fetchurl, fetchpatch
+{ lib, stdenv, fetchurl
 , freeglut, glew, libGL, libGLU, libX11, libXext, mesa
-, meson, ninja, pkg-config, wayland, wayland-protocols }:
+, meson, ninja, pkg-config, wayland, wayland-protocols
+, vulkan-loader, libxkbcommon, libdecor, glslang }:
 
 stdenv.mkDerivation rec {
   pname = "mesa-demos";
-  version = "8.5.0";
+  version = "9.0.0";
 
   src = fetchurl {
-    url = "https://archive.mesa3d.org/demos/${version}/${pname}-${version}.tar.bz2";
-    sha256 = "sha256-zqLfCoDwmjD2NcTrGmcr+Qxd3uC4539NcAQWaO9xqsE=";
+    url = "https://archive.mesa3d.org/demos/${pname}-${version}.tar.xz";
+    sha256 = "sha256-MEaj0mp7BRr3690lel8jv+sWDK1u2VIynN/x6fHtSWs=";
   };
 
-  patches = [
-    # https://gitlab.freedesktop.org/mesa/demos/-/merge_requests/83
-    ./demos-data-dir.patch
-
-    (fetchpatch {
-      url = "https://gitlab.freedesktop.org/mesa/demos/-/commit/b6d183f9943a275990aef7f08773e54c597572e5.patch";
-      sha256 = "4UdV+cxvNRqoT+Pdy0gkCPXJbhFr6CSCw/UOOB+rvuw=";
-    })
-  ];
-
   buildInputs = [
     freeglut glew libX11 libXext libGL libGLU mesa wayland
-    wayland-protocols
+    wayland-protocols vulkan-loader libxkbcommon libdecor glslang
   ] ++ lib.optional (mesa ? osmesa) mesa.osmesa ;
   nativeBuildInputs = [ meson ninja pkg-config ];
 

pkgs/tools/graphics/mesa-demos/demos-data-dir.patch

@@ -1,13 +0,0 @@
-diff --git a/meson.build b/meson.build
-index 282c39629da54ba6d7e1e380ffcf70da15e48d83..0c15274bff62b43f95ca7d7c5e29cc2dbd3cc42f 100644
---- a/meson.build
-+++ b/meson.build
-@@ -29,7 +29,7 @@ null_dep = dependency('', required : false)
- 
- demos_data_dir = '../data/'
- if get_option('with-system-data-files')
--  demos_data_dir = get_option('datadir') / 'mesa-demos'
-+  demos_data_dir = get_option('prefix') / get_option('datadir') / 'mesa-demos/'
- endif
- add_project_arguments(
-   '-DDEMOS_DATA_DIR="@0@"'.format(demos_data_dir),