pyrox.dev
monado: unstable-2023-01-14 -> unstable-2023-08-22
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
scrumplex.net
+24
-3
pkgs/applications/graphics/monado/default.nix
+24
-3
pkgs/applications/graphics/monado/default.nix
···
8
8
, pkg-config
9
9
, python3
10
10
, SDL2
11
+
, bluez
11
12
, dbus
12
13
, eigen
13
14
, ffmpeg
···
28
29
, libuvc
29
30
, libv4l
30
31
, libxcb
32
+
, onnxruntime
31
33
, opencv4
32
34
, openhmd
35
+
, openvr
33
36
, udev
34
37
, vulkan-headers
35
38
, vulkan-loader
···
47
50
48
51
stdenv.mkDerivation rec {
49
52
pname = "monado";
50
-
version = "unstable-2023-01-14";
53
+
version = "unstable-2023-08-22";
51
54
52
55
src = fetchFromGitLab {
53
56
domain = "gitlab.freedesktop.org";
54
57
owner = "monado";
55
58
repo = "monado";
56
-
rev = "1ef49b92f2d6cb519039edd7ba7f70e8073fbe88";
57
-
sha256 = "sha256-zieJmI6BKHpYyCPOOUora9qoWn+NXehbHKvoi4h81UA=";
59
+
rev = "4cc68f07c0f3c2fee57b01dde28a02e314d3bee6";
60
+
sha256 = "sha256-VibdOSA/b4RmwwwXrwhivuiukNK10YazYF/p+YnqRZ8=";
58
61
};
59
62
60
63
nativeBuildInputs = [
···
72
75
73
76
buildInputs = [
74
77
SDL2
78
+
bluez
75
79
dbus
76
80
eigen
77
81
ffmpeg
···
92
96
libuvc
93
97
libv4l
94
98
libxcb
99
+
onnxruntime
95
100
opencv4
96
101
openhmd
102
+
openvr
97
103
udev
98
104
vulkan-headers
99
105
vulkan-loader
···
104
110
zlib
105
111
];
106
112
113
+
# known disabled drivers:
114
+
# - DRIVER_DEPTHAI - Needs depthai-core https://github.com/luxonis/depthai-core
115
+
# - DRIVER_ILLIXR - needs ILLIXR headers https://github.com/ILLIXR/ILLIXR
116
+
# - DRIVER_REALSENSE - see below
117
+
# - DRIVER_SIMULAVR - needs realsense
118
+
# - DRIVER_ULV2 - needs proprietary Leapmotion SDK https://api.leapmotion.com/documentation/v2/unity/devguide/Leap_SDK_Overview.html
119
+
107
120
# realsense is disabled, the build ends with the following error:
108
121
#
109
122
# CMake Error in src/xrt/drivers/CMakeLists.txt:
···
118
131
setupHook = writeText "setup-hook" ''
119
132
export XDG_CONFIG_DIRS=@out@/etc/xdg''${XDG_CONFIG_DIRS:+:''${XDG_CONFIG_DIRS}}
120
133
'';
134
+
135
+
patches = [
136
+
# We don't have $HOME/.steam when building
137
+
./force-enable-steamvr_lh.patch
138
+
139
+
# A recent (as of August 2023) SteamVR Beta has upgraded a driver interface which is incompatible with Monado
140
+
./steamvr_lh-use-old-interface.patch
141
+
];
121
142
122
143
meta = with lib; {
123
144
description = "Open source XR runtime";
+12
pkgs/applications/graphics/monado/force-enable-steamvr_lh.patch
+12
pkgs/applications/graphics/monado/force-enable-steamvr_lh.patch
···
1
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
2
+
index 4308d73d..0081d536 100644
3
+
--- a/CMakeLists.txt
4
+
+++ b/CMakeLists.txt
5
+
@@ -219,6 +219,7 @@ option(BUILD_TESTING "Enable building of the test suite?" ON)
6
+
if(EXISTS "$ENV{HOME}/.steam/root")
7
+
set(XRT_HAVE_STEAM YES)
8
+
endif()
9
+
+set(XRT_HAVE_STEAM YES)
10
+
11
+
if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
12
+
set(XRT_HAVE_INTERNAL_HID ON)
+13
pkgs/applications/graphics/monado/steamvr_lh-use-old-interface.patch
+13
pkgs/applications/graphics/monado/steamvr_lh-use-old-interface.patch
···
1
+
diff --git a/src/xrt/drivers/steamvr_lh/steamvr_lh.cpp b/src/xrt/drivers/steamvr_lh/steamvr_lh.cpp
2
+
index 24b69fd..5b3a5ca 100644
3
+
--- a/src/xrt/drivers/steamvr_lh/steamvr_lh.cpp
4
+
+++ b/src/xrt/drivers/steamvr_lh/steamvr_lh.cpp
5
+
@@ -138,7 +138,7 @@ Context::setup_hmd(const char *serial, vr::ITrackedDeviceServerDriver *driver)
6
+
vr::EVRInitError err = driver->Activate(0);
7
+
VERIFY(err == vr::VRInitError_None, std::to_string(err).c_str());
8
+
9
+
- auto *display = static_cast<vr::IVRDisplayComponent *>(driver->GetComponent(vr::IVRDisplayComponent_Version));
10
+
+ auto *display = static_cast<vr::IVRDisplayComponent *>(driver->GetComponent("IVRDisplayComponent_003"));
11
+
VERIFY(display, "IVRDisplayComponent is null");
12
+
#undef VERIFY
13
+