diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-03-02 12:01:28 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-03-02 12:01:28 +0000 |
commit | f51807feea1334c25a24de52154b35271feda13c (patch) | |
tree | 3be40b4b2ec9809037e8f74df32cedbb72e50e00 /pkgs/applications/graphics | |
parent | aefac840b87e8e0ab658fa5080539e292ad8a9ba (diff) | |
parent | 4e6904ee82c5c40eba5d9b3198df1ae9223cb7e9 (diff) | |
download | nixlib-f51807feea1334c25a24de52154b35271feda13c.tar nixlib-f51807feea1334c25a24de52154b35271feda13c.tar.gz nixlib-f51807feea1334c25a24de52154b35271feda13c.tar.bz2 nixlib-f51807feea1334c25a24de52154b35271feda13c.tar.lz nixlib-f51807feea1334c25a24de52154b35271feda13c.tar.xz nixlib-f51807feea1334c25a24de52154b35271feda13c.tar.zst nixlib-f51807feea1334c25a24de52154b35271feda13c.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/graphics')
-rw-r--r-- | pkgs/applications/graphics/monado/default.nix | 40 |
1 files changed, 22 insertions, 18 deletions
diff --git a/pkgs/applications/graphics/monado/default.nix b/pkgs/applications/graphics/monado/default.nix index 7442f192fe24..68ebaa5f9dcd 100644 --- a/pkgs/applications/graphics/monado/default.nix +++ b/pkgs/applications/graphics/monado/default.nix @@ -3,6 +3,7 @@ , fetchFromGitLab , writeText , cmake +, cjson , doxygen , glslang , pkg-config @@ -11,6 +12,7 @@ , bluez , dbus , eigen +, elfutils , ffmpeg , gst-plugins-base , gstreamer @@ -19,11 +21,13 @@ , libXau , libXdmcp , libXrandr +, libXext , libbsd , libffi , libjpeg -# , librealsense +, librealsense , libsurvive +, libunwind , libusb1 , libuv , libuvc @@ -33,6 +37,9 @@ , opencv4 , openhmd , openvr +, orc +, pcre2 +, shaderc , udev , vulkan-headers , vulkan-loader @@ -41,6 +48,7 @@ , wayland-scanner , libdrm , zlib +, zstd , nixosTests # Set as 'false' to build monado without service support, i.e. allow VR # applications linking against libopenxr_monado.so to use OpenXR standalone @@ -77,8 +85,10 @@ stdenv.mkDerivation { buildInputs = [ SDL2 bluez + cjson dbus eigen + elfutils ffmpeg gst-plugins-base gstreamer @@ -90,8 +100,9 @@ stdenv.mkDerivation { libbsd libjpeg libffi - # librealsense.dev - see below + librealsense libsurvive + libunwind libusb1 libuv libuvc @@ -101,6 +112,9 @@ stdenv.mkDerivation { opencv4 openhmd openvr + orc + pcre2 + shaderc udev vulkan-headers vulkan-loader @@ -109,24 +123,14 @@ stdenv.mkDerivation { wayland-protocols libdrm zlib + zstd ]; - # known disabled drivers: - # - DRIVER_DEPTHAI - Needs depthai-core https://github.com/luxonis/depthai-core - # - DRIVER_ILLIXR - needs ILLIXR headers https://github.com/ILLIXR/ILLIXR - # - DRIVER_REALSENSE - see below - # - DRIVER_SIMULAVR - needs realsense - # - DRIVER_ULV2 - needs proprietary Leapmotion SDK https://api.leapmotion.com/documentation/v2/unity/devguide/Leap_SDK_Overview.html - - # realsense is disabled, the build ends with the following error: - # - # CMake Error in src/xrt/drivers/CMakeLists.txt: - # Imported target "realsense2::realsense2" includes non-existent path - # "/nix/store/2v95aps14hj3jy4ryp86vl7yymv10mh0-librealsense-2.41.0/include" - # in its INTERFACE_INCLUDE_DIRECTORIES. - # - # for some reason cmake is trying to use ${librealsense}/include - # instead of ${librealsense.dev}/include as an include directory + # known disabled drivers/features: + # - DRIVER_DEPTHAI - Needs depthai-core https://github.com/luxonis/depthai-core (See https://github.com/NixOS/nixpkgs/issues/292618) + # - DRIVER_ILLIXR - needs ILLIXR headers https://github.com/ILLIXR/ILLIXR (See https://github.com/NixOS/nixpkgs/issues/292661) + # - DRIVER_ULV2 - Needs proprietary Leapmotion SDK https://api.leapmotion.com/documentation/v2/unity/devguide/Leap_SDK_Overview.html (See https://github.com/NixOS/nixpkgs/issues/292624) + # - DRIVER_ULV5 - Needs proprietary Leapmotion SDK https://api.leapmotion.com/documentation/v2/unity/devguide/Leap_SDK_Overview.html (See https://github.com/NixOS/nixpkgs/issues/292624) # Help openxr-loader find this runtime setupHook = writeText "setup-hook" '' |