mirror of
https://github.com/lopsided98/nix-ros-overlay.git
synced 2025-06-10 01:42:24 +03:00
catkin-setup-hook: experimental wrapping support
This commit is contained in:
parent
0fd7813c2c
commit
2e8b279148
2 changed files with 11 additions and 1 deletions
|
@ -75,4 +75,10 @@ _catkinPostInstallHook() {
|
||||||
}
|
}
|
||||||
postInstallHooks+=(_catkinPostInstallHook)
|
postInstallHooks+=(_catkinPostInstallHook)
|
||||||
|
|
||||||
|
_catkinWrapperHook() {
|
||||||
|
makeWrapperArgs+=(--prefix ROS_PACKAGE_PATH : "${out}:${ROS_PACKAGE_PATH}")
|
||||||
|
wrapPythonPrograms
|
||||||
|
}
|
||||||
|
postFixupHooks+=(_catkinWrapperHook)
|
||||||
|
|
||||||
export CATKIN_SHELL=bash
|
export CATKIN_SHELL=bash
|
||||||
|
|
|
@ -40,7 +40,11 @@ let
|
||||||
}: let
|
}: let
|
||||||
setupHook = self.callPackage ./catkin-setup-hook { };
|
setupHook = self.callPackage ./catkin-setup-hook { };
|
||||||
in {
|
in {
|
||||||
propagatedBuildInputs = [ self.cmake setupHook ] ++ propagatedBuildInputs;
|
propagatedBuildInputs = [
|
||||||
|
self.cmake
|
||||||
|
rosSelf.pythonPackages.wrapPython
|
||||||
|
setupHook
|
||||||
|
] ++ propagatedBuildInputs;
|
||||||
|
|
||||||
postPatch = postPatch + ''
|
postPatch = postPatch + ''
|
||||||
patchShebangs cmake
|
patchShebangs cmake
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue