diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2022-08-11 23:53:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-11 23:53:15 +0200 |
| commit | c4a5342da6e8cd28d6454c99a70971b88b4297e3 (patch) | |
| tree | 31150bcd15c71739e41c810d9b958c1e6086faeb | |
| parent | 1df1a8a07f2881225438141b827144d99e8a77f7 (diff) | |
| parent | 6a5f7b66ca60fe4df2210b4de25e938642468100 (diff) | |
Merge pull request #175048 from pbsds/realsense-viewer
| -rw-r--r-- | pkgs/development/libraries/librealsense/default.nix | 16 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 16 insertions, 4 deletions
diff --git a/pkgs/development/libraries/librealsense/default.nix b/pkgs/development/libraries/librealsense/default.nix index 5b1673ae3729..135969210d36 100644 --- a/pkgs/development/libraries/librealsense/default.nix +++ b/pkgs/development/libraries/librealsense/default.nix @@ -8,8 +8,14 @@ , ninja , pkg-config , gcc +, mesa +, gtk3 +, glfw +, libGLU +, curl , cudaSupport ? config.cudaSupport or false, cudaPackages ? {} , enablePython ? false, pythonPackages ? null +, enableGUI ? false, }: assert cudaSupport -> (cudaPackages?cudatoolkit && cudaPackages.cudatoolkit != null); @@ -32,7 +38,8 @@ stdenv.mkDerivation rec { libusb1 gcc.cc.lib ] ++ lib.optional cudaSupport cudaPackages.cudatoolkit - ++ lib.optionals enablePython (with pythonPackages; [python pybind11 ]); + ++ lib.optionals enablePython (with pythonPackages; [ python pybind11 ]) + ++ lib.optionals enableGUI [ mesa gtk3 glfw libGLU curl ]; patches = [ # fix build on aarch64-darwin @@ -53,8 +60,9 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_EXAMPLES=ON" - "-DBUILD_GRAPHICAL_EXAMPLES=OFF" - "-DBUILD_GLSL_EXTENSIONS=OFF" + "-DBUILD_GRAPHICAL_EXAMPLES=${lib.boolToString enableGUI}" + "-DBUILD_GLSL_EXTENSIONS=${lib.boolToString enableGUI}" + "-DCHECK_FOR_UPDATES=OFF" # activated by BUILD_GRAPHICAL_EXAMPLES, will make it download and compile libcurl ] ++ lib.optionals enablePython [ "-DBUILD_PYTHON_BINDINGS:bool=true" "-DXXNIX_PYTHON_SITEPACKAGES=${placeholder "out"}/${pythonPackages.python.sitePackages}" @@ -72,7 +80,7 @@ stdenv.mkDerivation rec { description = "A cross-platform library for Intel® RealSense™ depth cameras (D400 series and the SR300)"; homepage = "https://github.com/IntelRealSense/librealsense"; license = licenses.asl20; - maintainers = with maintainers; [ brian-dawn ]; + maintainers = with maintainers; [ brian-dawn pbsds ]; platforms = platforms.unix; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b90ab3de4a37..68cdd2a8958e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24042,6 +24042,10 @@ with pkgs; cudaSupport = false; }; + librealsense-gui = callPackage ../development/libraries/librealsense { + enableGUI = true; + }; + libsass = callPackage ../development/libraries/libsass { }; libsepol = callPackage ../os-specific/linux/libsepol { }; |