git.iko.soy/typeable/nixpkgs
on master help sign in
librealsense2: 2.43.0 -> 2.45.0
commit2b9d79b12effd52621cc27991d2c9ead4cf64b1c authorRobert T. McGibbon <rmcgibbo@gmail.com> dateMon 10 May 2021, 17:31 (6 years ago) parent7217b2d
2 files changed+43−3
pkgs/development/libraries/librealsense/default.nix+4−3 pkgs/development/libraries/librealsense/py_pybind11_no_external_download.patch+39
pkgs/development/libraries/librealsense/default.nix+4−3
@@ -7,7 +7,7 @@ assert enablePython -> pythonPackages != null;
77
88stdenv.mkDerivation rec {
99 pname = "librealsense";
10− version = "2.43.0";
10+ version = "2.45.0";
1111
1212 outputs = [ "out" "dev" ];
1313
@@ -15,17 +15,18 @@ stdenv.mkDerivation rec {
1515 owner = "IntelRealSense";
1616 repo = pname;
1717 rev = "v${version}";
18− sha256 = "sha256-N7EvpcJjtK3INHK7PgoiEVIMq9zGcHKMeI+/dwZ3bNs=";
18+ sha256 = "0aqf48zl7825v7x8c3x5w4d17m4qq377f1mn6xyqzf9b0dnk4i1j";
1919 };
2020
2121 buildInputs = [
2222 libusb1
2323 gcc.cc.lib
2424 ] ++ lib.optional cudaSupport cudatoolkit
25− ++ lib.optional enablePython pythonPackages.python;
25+ ++ lib.optionals enablePython (with pythonPackages; [python pybind11 ]);
2626
2727 patches = lib.optionals enablePython [
2828 ./py_sitepackage_dir.patch
29+ ./py_pybind11_no_external_download.patch
2930 ];
3031
3132 nativeBuildInputs = [
pkgs/development/libraries/librealsense/py_pybind11_no_external_download.patchnew file+39
@@ -0,0 +1,39 @@
1+From 01e51b9c90ba51b2d0ca797dde676812cf3db415 Mon Sep 17 00:00:00 2001
2+From: "Robert T. McGibbon" <rmcgibbo@gmail.com>
3+Date: Mon, 10 May 2021 17:26:04 -0400
4+Subject: [PATCH 1/1] V1
5+
6+---
7+ wrappers/python/CMakeLists.txt | 15 +--------------
8+ 1 file changed, 1 insertion(+), 14 deletions(-)
9+
10+diff --git a/wrappers/python/CMakeLists.txt b/wrappers/python/CMakeLists.txt
11+index aa83e4c77..4ec92ccfa 100644
12+--- a/wrappers/python/CMakeLists.txt
13++++ b/wrappers/python/CMakeLists.txt
14+@@ -8,21 +8,8 @@ if (NOT BUILD_PYTHON_BINDINGS)
15+ endif()
16+
17+ set(DEPENDENCIES realsense2)
18+-# In order for the external project clone to occur during cmake configure step(rather than during compilation, as would normally happen),
19+-# we copy the external project declaration to the build folder and then execute it
20+-configure_file(${CMAKE_SOURCE_DIR}/third-party/pybind11/CMakeLists.txt ${CMAKE_BINARY_DIR}/external-projects/pybind11/CMakeLists.txt)
21+-execute_process(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" .
22+- WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/external-projects/pybind11"
23+-)
24+-execute_process(COMMAND "${CMAKE_COMMAND}" --build .
25+- WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/external-projects/pybind11"
26+-)
27+
28+-# Add pybind11 makefile
29+-add_subdirectory("${CMAKE_BINARY_DIR}/third-party/pybind11"
30+- "${CMAKE_BINARY_DIR}/third-party/pybind11"
31+- EXCLUDE_FROM_ALL
32+-)
33++find_package(pybind11 REQUIRED)
34+
35+ set(PYBIND11_CPP_STANDARD -std=c++11)
36+ # Force Pybind11 not to share pyrealsense2 resources with other pybind modules.
37+--
38+2.29.3
39+