diff options
| author | Pavol Rusnak <pavol@rusnak.io> | 2024-06-24 15:20:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-24 15:20:30 +0200 |
| commit | 6acfb07b7ff392f1cdfe2dfb96f21cb919ca359d (patch) | |
| tree | d0eacadbf458152bcc7e61e7a89c1b36efacfb08 /pkgs | |
| parent | 96d94375d451ddb4d91b322f698ab5eef254eae9 (diff) | |
| parent | b6815f85706b731569a8651232e75897a3168686 (diff) | |
Merge pull request #322019 from Pandapip1/monado-enable-steamvr-with-flag
monado: Use cmake flag instead of patch
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/graphics/monado/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/applications/graphics/monado/force-enable-steamvr_lh.patch | 12 |
2 files changed, 1 insertions, 17 deletions
diff --git a/pkgs/applications/graphics/monado/default.nix b/pkgs/applications/graphics/monado/default.nix index fa386c9744f68..95889ffff4d51 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 eac92675ebd96..0000000000000 --- 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) |