mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-08 21:24:03 +00:00
monado: Use cmake flag instead of patch
This commit is contained in:
parent
b4eaf50471
commit
b6815f8570
@ -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;
|
||||
};
|
||||
|
@ -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)
|
Loading…
Reference in New Issue
Block a user