From ed463681f0c79c8b98277e07843a57a2bc493d93 Mon Sep 17 00:00:00 2001 From: Shashwat Ganesh <57328978+kknives@users.noreply.github.com> Date: Mon, 19 Jun 2023 16:10:30 +0000 Subject: [PATCH 1/2] librealsense: Fix bad include directories in cmake Set $dev/include as the correct include directory in the cmake manifest. --- pkgs/development/libraries/librealsense/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/librealsense/default.nix b/pkgs/development/libraries/librealsense/default.nix index 59bc2a056616..cb7c64b57586 100644 --- a/pkgs/development/libraries/librealsense/default.nix +++ b/pkgs/development/libraries/librealsense/default.nix @@ -80,6 +80,9 @@ stdenv.mkDerivation rec { # ( https://github.com/IntelRealSense/meta-intel-realsense/issues/20 ) postInstall = lib.optionalString enablePython '' cp ../wrappers/python/pyrealsense2/__init__.py $out/${pythonPackages.python.sitePackages}/pyrealsense2 + '' + '' + substituteInPlace $out/lib/cmake/realsense2/realsense2Targets.cmake \ + --replace "\''${_IMPORT_PREFIX}/include" "$dev/include" ''; meta = with lib; { From 85b87c5cc408a3561c57d21c7bfb733d1f7f7f41 Mon Sep 17 00:00:00 2001 From: Shashwat Ganesh <57328978+kknives@users.noreply.github.com> Date: Mon, 19 Jun 2023 17:00:29 +0000 Subject: [PATCH 2/2] librealsense: Refactor postInstall for better clarity --- pkgs/development/libraries/librealsense/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/librealsense/default.nix b/pkgs/development/libraries/librealsense/default.nix index cb7c64b57586..cfe7fb89bd56 100644 --- a/pkgs/development/libraries/librealsense/default.nix +++ b/pkgs/development/libraries/librealsense/default.nix @@ -78,11 +78,11 @@ stdenv.mkDerivation rec { # script does not do this, and it's questionable if intel knows it should be # done # ( https://github.com/IntelRealSense/meta-intel-realsense/issues/20 ) - postInstall = lib.optionalString enablePython '' - cp ../wrappers/python/pyrealsense2/__init__.py $out/${pythonPackages.python.sitePackages}/pyrealsense2 - '' + '' + postInstall = '' substituteInPlace $out/lib/cmake/realsense2/realsense2Targets.cmake \ --replace "\''${_IMPORT_PREFIX}/include" "$dev/include" + '' + lib.optionalString enablePython '' + cp ../wrappers/python/pyrealsense2/__init__.py $out/${pythonPackages.python.sitePackages}/pyrealsense2 ''; meta = with lib; {