From 54c95acb8a75c8b40d4af8261d5d99129162ec7c Mon Sep 17 00:00:00 2001 From: Atemu Date: Sat, 11 Jun 2022 22:24:42 +0200 Subject: [PATCH 1/2] openxr-loader: build tests for hello_xr --- pkgs/development/libraries/openxr-loader/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/openxr-loader/default.nix b/pkgs/development/libraries/openxr-loader/default.nix index 514cbcea4a12..cfdd8d9f5b70 100644 --- a/pkgs/development/libraries/openxr-loader/default.nix +++ b/pkgs/development/libraries/openxr-loader/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, python3, libX11, libXxf86vm, libXrandr, vulkan-headers, libGL }: +{ lib, stdenv, fetchFromGitHub, cmake, python3, libX11, libXxf86vm, libXrandr, vulkan-headers, libGL, vulkan-loader }: stdenv.mkDerivation rec { pname = "openxr-loader"; @@ -12,9 +12,9 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake python3 ]; - buildInputs = [ libX11 libXxf86vm libXrandr vulkan-headers libGL ]; + buildInputs = [ libX11 libXxf86vm libXrandr vulkan-headers libGL vulkan-loader ]; - cmakeFlags = [ "-DBUILD_TESTS=OFF" ]; + cmakeFlags = [ "-DBUILD_TESTS=ON" ]; outputs = [ "out" "dev" "layers" ]; From c65e990ed2e50378a26cf10399fe9265fd625fa9 Mon Sep 17 00:00:00 2001 From: Atemu Date: Sat, 11 Jun 2022 23:04:41 +0200 Subject: [PATCH 2/2] openxr-loader: enable wayland Not sure this is required as it seems to work without but do it anyways for good measure --- pkgs/development/libraries/openxr-loader/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/openxr-loader/default.nix b/pkgs/development/libraries/openxr-loader/default.nix index cfdd8d9f5b70..c83b4c2f19b2 100644 --- a/pkgs/development/libraries/openxr-loader/default.nix +++ b/pkgs/development/libraries/openxr-loader/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, python3, libX11, libXxf86vm, libXrandr, vulkan-headers, libGL, vulkan-loader }: +{ lib, stdenv, fetchFromGitHub, cmake, python3, libX11, libXxf86vm, libXrandr, vulkan-headers, libGL, vulkan-loader, wayland, pkg-config }: stdenv.mkDerivation rec { pname = "openxr-loader"; @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-YaK7scnfXkxhRe/PKZukqHD9X70X0/QUDL0znTPbIBE="; }; - nativeBuildInputs = [ cmake python3 ]; - buildInputs = [ libX11 libXxf86vm libXrandr vulkan-headers libGL vulkan-loader ]; + nativeBuildInputs = [ cmake python3 pkg-config ]; + buildInputs = [ libX11 libXxf86vm libXrandr vulkan-headers libGL vulkan-loader wayland ]; cmakeFlags = [ "-DBUILD_TESTS=ON" ];