diff --git a/pkgs/applications/graphics/xrgears/default.nix b/pkgs/by-name/xr/xrgears/package.nix similarity index 50% rename from pkgs/applications/graphics/xrgears/default.nix rename to pkgs/by-name/xr/xrgears/package.nix index cdb0977b4e97..82a801a54be0 100644 --- a/pkgs/applications/graphics/xrgears/default.nix +++ b/pkgs/by-name/xr/xrgears/package.nix @@ -1,30 +1,33 @@ -{ lib, stdenv -, fetchFromGitLab -, glm -, glslang -, meson -, ninja -, openxr-loader -, pkg-config -, vulkan-headers -, vulkan-loader -, xxd -, SDL2 -, makeWrapper -, libGL -, glib +{ + SDL2, + fetchFromGitLab, + glib, + glm, + glslang, + lib, + libGL, + makeWrapper, + meson, + ninja, + openxr-loader, + pkg-config, + stdenv, + unstableGitUpdater, + vulkan-headers, + vulkan-loader, + xxd, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "xrgears"; - version = "unstable-2021-06-19"; + version = "1.0.1-unstable-2024-07-09"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "monado"; repo = "demos/xrgears"; - rev = "6331b98e065494995c9cc4b48ccdd9d5ccaef461"; - sha256 = "sha256-buw2beTPIWScq+3VQjUyF+uOwS6VF+mnAPHZ2eFGZjc="; + rev = "9cabbd34b1f60f27402a9a50fc260f77a41b835b"; + sha256 = "sha256-9VV1zAOZKkl1zzjnsQQQOINi+T+wpbltdWpJ/d66+cM="; }; nativeBuildInputs = [ @@ -46,15 +49,25 @@ stdenv.mkDerivation rec { fixupPhase = '' wrapProgram $out/bin/xrgears \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ SDL2 libGL ]} + --prefix LD_LIBRARY_PATH : ${ + lib.makeLibraryPath [ + SDL2 + libGL + ] + } ''; + passthru.updateScript = unstableGitUpdater { }; + meta = with lib; { homepage = "https://gitlab.freedesktop.org/monado/demos/xrgears"; description = "OpenXR example using Vulkan for rendering"; mainProgram = "xrgears"; platforms = platforms.linux; license = licenses.mit; - maintainers = with maintainers; [ expipiplus1 ]; + maintainers = with maintainers; [ + expipiplus1 + Scrumplex + ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 406f7b239157..44429147990e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33579,8 +33579,6 @@ with pkgs; xrestop = callPackage ../tools/X11/xrestop { }; - xrgears = callPackage ../applications/graphics/xrgears { }; - xsd = callPackage ../development/libraries/xsd { stdenv = gcc9Stdenv; };