diff options
author | Pavol Rusnak <pavol@rusnak.io> | 2024-03-27 00:59:39 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-03-27 00:59:39 +0100 |
commit | e80d1b630036fe33badbc168dfcd071d463b92cf (patch) | |
tree | 04ffcfd53823ade1b38981cfe1acba6d2fd6fc1f | |
parent | a20dc76e95303314cef7b1af33a198594ebf3396 (diff) | |
parent | 5c56180640eeb3942792fd343f472ed545a19c7c (diff) |
Merge pull request #298083 from Pandapip1/patch-1
monado: Add missing package in `buildInputs` and alphabetize
-rw-r--r-- | pkgs/applications/graphics/monado/default.nix | 43 |
1 files changed, 22 insertions, 21 deletions
diff --git a/pkgs/applications/graphics/monado/default.nix b/pkgs/applications/graphics/monado/default.nix index 68ebaa5f9dcd1..a79b112780504 100644 --- a/pkgs/applications/graphics/monado/default.nix +++ b/pkgs/applications/graphics/monado/default.nix @@ -2,28 +2,22 @@ , stdenv , fetchFromGitLab , writeText -, cmake -, cjson -, doxygen -, glslang -, pkg-config -, python3 -, SDL2 , bluez +, cjson +, cmake , dbus +, doxygen , eigen , elfutils , ffmpeg +, glslang , gst-plugins-base , gstreamer , hidapi -, libGL -, libXau -, libXdmcp -, libXrandr -, libXext , libbsd +, libdrm , libffi +, libGL , libjpeg , librealsense , libsurvive @@ -32,13 +26,20 @@ , libuv , libuvc , libv4l +, libXau , libxcb +, libXdmcp +, libXext +, libXrandr , onnxruntime , opencv4 , openhmd , openvr , orc , pcre2 +, pkg-config +, python3 +, SDL2 , shaderc , udev , vulkan-headers @@ -46,7 +47,6 @@ , wayland , wayland-protocols , wayland-scanner -, libdrm , zlib , zstd , nixosTests @@ -83,7 +83,6 @@ stdenv.mkDerivation { ]; buildInputs = [ - SDL2 bluez cjson dbus @@ -93,13 +92,11 @@ stdenv.mkDerivation { gst-plugins-base gstreamer hidapi - libGL - libXau - libXdmcp - libXrandr libbsd - libjpeg + libdrm libffi + libGL + libjpeg librealsense libsurvive libunwind @@ -107,21 +104,25 @@ stdenv.mkDerivation { libuv libuvc libv4l + libXau libxcb + libXdmcp + libXext + libXrandr onnxruntime opencv4 openhmd openvr orc pcre2 + SDL2 shaderc udev vulkan-headers vulkan-loader wayland - wayland-scanner wayland-protocols - libdrm + wayland-scanner zlib zstd ]; |