From b6815f85706b731569a8651232e75897a3168686 Mon Sep 17 00:00:00 2001 From: Gavin John <> Date: Mon, 24 Jun 2024 06:36:27 -0500 Subject: [PATCH] monado: Use cmake flag instead of patch --- pkgs/applications/graphics/monado/default.nix | 6 +----- .../graphics/monado/force-enable-steamvr_lh.patch | 12 ------------ 2 files changed, 1 insertion(+), 17 deletions(-) delete mode 100644 pkgs/applications/graphics/monado/force-enable-steamvr_lh.patch diff --git a/pkgs/applications/graphics/monado/default.nix b/pkgs/applications/graphics/monado/default.nix index fa386c9744f6..95889ffff4d5 100644 --- a/pkgs/applications/graphics/monado/default.nix +++ b/pkgs/applications/graphics/monado/default.nix @@ -83,6 +83,7 @@ stdenv.mkDerivation { "-DXRT_OPENXR_INSTALL_ABSOLUTE_RUNTIME_PATH=ON" "-DXRT_HAVE_TRACY=ON" "-DXRT_FEATURE_TRACING=ON" + "-DXRT_HAVE_STEAM=ON" ]; buildInputs = [ @@ -142,11 +143,6 @@ stdenv.mkDerivation { export XDG_CONFIG_DIRS=@out@/etc/xdg''${XDG_CONFIG_DIRS:+:''${XDG_CONFIG_DIRS}} ''; - patches = [ - # We don't have $HOME/.steam when building - ./force-enable-steamvr_lh.patch - ]; - passthru.tests = { basic-service = nixosTests.monado; }; diff --git a/pkgs/applications/graphics/monado/force-enable-steamvr_lh.patch b/pkgs/applications/graphics/monado/force-enable-steamvr_lh.patch deleted file mode 100644 index eac92675ebd9..000000000000 --- a/pkgs/applications/graphics/monado/force-enable-steamvr_lh.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4308d73d..0081d536 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -219,6 +219,7 @@ option(BUILD_TESTING "Enable building of the test suite?" ON) - if(EXISTS "$ENV{HOME}/.steam/root") - set(XRT_HAVE_STEAM YES) - endif() -+set(XRT_HAVE_STEAM YES) - - if(CMAKE_SYSTEM_NAME STREQUAL "Linux") - set(XRT_HAVE_INTERNAL_HID ON)