From f4a5fd46823cba2140eb7a12bcd188106890b017 Mon Sep 17 00:00:00 2001 From: ckie Date: Sun, 5 Dec 2021 21:58:25 +0200 Subject: [PATCH 1/2] xrgears: add LD_LIBRARY_PATH wrapper to unbreak --- pkgs/applications/graphics/xrgears/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/applications/graphics/xrgears/default.nix b/pkgs/applications/graphics/xrgears/default.nix index 20e01a1701da..72010e26f594 100644 --- a/pkgs/applications/graphics/xrgears/default.nix +++ b/pkgs/applications/graphics/xrgears/default.nix @@ -9,6 +9,9 @@ , vulkan-headers , vulkan-loader , xxd +, SDL2 +, makeWrapper +, libGL }: stdenv.mkDerivation rec { @@ -29,6 +32,7 @@ stdenv.mkDerivation rec { ninja pkg-config xxd + makeWrapper ]; buildInputs = [ @@ -38,6 +42,11 @@ stdenv.mkDerivation rec { vulkan-loader ]; + fixupPhase = '' + wrapProgram $out/bin/xrgears \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ SDL2 libGL ]} + ''; + meta = with lib; { homepage = "https://gitlab.freedesktop.org/monado/demos/xrgears"; description = "An OpenXR example using Vulkan for rendering"; From 31e19b9546fc7ea38a2598647c9cf39fba63ce16 Mon Sep 17 00:00:00 2001 From: ckie Date: Sun, 5 Dec 2021 21:59:04 +0200 Subject: [PATCH 2/2] xrgears: unstable-2020-04-15 -> unstable-2021-06-19 --- pkgs/applications/graphics/xrgears/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/xrgears/default.nix b/pkgs/applications/graphics/xrgears/default.nix index 72010e26f594..ac73412117cf 100644 --- a/pkgs/applications/graphics/xrgears/default.nix +++ b/pkgs/applications/graphics/xrgears/default.nix @@ -12,18 +12,19 @@ , SDL2 , makeWrapper , libGL +, glib }: stdenv.mkDerivation rec { pname = "xrgears"; - version = "unstable-2020-04-15"; + version = "unstable-2021-06-19"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "monado"; repo = "demos/xrgears"; - rev = "d0bee35fbf8f181e8313f1ead13d88c4fb85c154"; - sha256 = "1k0k8dkclyiav99kf0933kyd2ymz3hs1p0ap2wbciq9s62jgz29i"; + rev = "6331b98e065494995c9cc4b48ccdd9d5ccaef461"; + sha256 = "sha256-buw2beTPIWScq+3VQjUyF+uOwS6VF+mnAPHZ2eFGZjc="; }; nativeBuildInputs = [ @@ -40,6 +41,7 @@ stdenv.mkDerivation rec { openxr-loader vulkan-headers vulkan-loader + glib ]; fixupPhase = ''