diff options
| author | K900 <me@0upti.me> | 2023-03-23 21:48:28 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-23 21:48:28 +0300 |
| commit | 3054b4d23283bc7b19b4b7fcbabfadfc662c6432 (patch) | |
| tree | aa3aff2a0b054338b8f5de4ed28dee5f2f7abbb4 /pkgs/tools | |
| parent | 4a3d90135ba8d31ef4d5a19de23f7e74b9914d08 (diff) | |
| parent | 2607d40e5812f2d3fed91c4e115d475ef9f04b50 (diff) | |
| download | nixlib-3054b4d23283bc7b19b4b7fcbabfadfc662c6432.tar nixlib-3054b4d23283bc7b19b4b7fcbabfadfc662c6432.tar.gz nixlib-3054b4d23283bc7b19b4b7fcbabfadfc662c6432.tar.bz2 nixlib-3054b4d23283bc7b19b4b7fcbabfadfc662c6432.tar.lz nixlib-3054b4d23283bc7b19b4b7fcbabfadfc662c6432.tar.xz nixlib-3054b4d23283bc7b19b4b7fcbabfadfc662c6432.tar.zst nixlib-3054b4d23283bc7b19b4b7fcbabfadfc662c6432.zip | |
Merge pull request #222555 from K900/mesa-demos-9.0.0
mesa-demos: 8.5.0 -> 9.0.0
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/graphics/mesa-demos/default.nix | 23 | ||||
| -rw-r--r-- | pkgs/tools/graphics/mesa-demos/demos-data-dir.patch | 13 |
2 files changed, 7 insertions, 29 deletions
diff --git a/pkgs/tools/graphics/mesa-demos/default.nix b/pkgs/tools/graphics/mesa-demos/default.nix index efc58c370736..558e9d5d92f9 100644 --- a/pkgs/tools/graphics/mesa-demos/default.nix +++ b/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 ]; diff --git a/pkgs/tools/graphics/mesa-demos/demos-data-dir.patch b/pkgs/tools/graphics/mesa-demos/demos-data-dir.patch deleted file mode 100644 index d2f22a675ce3..000000000000 --- a/pkgs/tools/graphics/mesa-demos/demos-data-dir.patch +++ /dev/null @@ -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), |