From 3b7fe79bce5c49a2c40789402e9c674cd51dbdc4 Mon Sep 17 00:00:00 2001 From: Atemu Date: Sat, 11 Jun 2022 22:29:11 +0200 Subject: [PATCH 1/2] monado: enable wayland support --- pkgs/applications/graphics/monado/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/graphics/monado/default.nix b/pkgs/applications/graphics/monado/default.nix index 41a2487a8525..4051c78b52ef 100644 --- a/pkgs/applications/graphics/monado/default.nix +++ b/pkgs/applications/graphics/monado/default.nix @@ -35,6 +35,8 @@ , vulkan-loader , wayland , wayland-protocols +, wayland-scanner +, libdrm , zlib # Set as 'false' to build monado without service support, i.e. allow VR # applications linking against libopenxr_monado.so to use OpenXR standalone @@ -95,7 +97,9 @@ stdenv.mkDerivation rec { vulkan-headers vulkan-loader wayland + wayland-scanner wayland-protocols + libdrm zlib ]; From 9b2a771b8fe6aef77cd0c713ca2736219cea3472 Mon Sep 17 00:00:00 2001 From: Atemu Date: Sat, 11 Jun 2022 22:29:28 +0200 Subject: [PATCH 2/2] monado: use absolute runtime path in manifest It used a weird mangled relative path that didn't work before and we have the luxury that absolute paths always work exactly as we want them with Nix. --- pkgs/applications/graphics/monado/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/graphics/monado/default.nix b/pkgs/applications/graphics/monado/default.nix index 4051c78b52ef..99e7b042d161 100644 --- a/pkgs/applications/graphics/monado/default.nix +++ b/pkgs/applications/graphics/monado/default.nix @@ -67,6 +67,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DXRT_FEATURE_SERVICE=${if serviceSupport then "ON" else "OFF"}" + "-DXRT_OPENXR_INSTALL_ABSOLUTE_RUNTIME_PATH=ON" ]; buildInputs = [