movefasta/nix-ros-overlay
1
0
Fork 0
mirror of https://github.com/lopsided98/nix-ros-overlay.git synced 2025-06-20 14:18:39 +03:00
Code Activity

ament-cmake-core: use build platform Python

Browse source
This commit is contained in:
Ben Wolsieffer 2022-09-20 15:26:10 -04:00
parent 032fe0bbc8
commit b6ad7f87f1
3 changed files with 21 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
distros/ament-cmake-core-setup-hook/default.nix Normal file
View file

@ -0,0 +1,9 @@
{ makeSetupHook, python }:
makeSetupHook {
name = "ament-cmake-core-setup-hook";
substitutions = {
python_major = python.sourceVersion.major;
python_executable = python.pythonForBuild.interpreter;
};
} ./setup-hook.sh

6
distros/ament-cmake-core-setup-hook.sh → distros/ament-cmake-core-setup-hook/setup-hook.sh
View file

@ -20,12 +20,14 @@ _findAmentPackages() {
fi fi
_amentPackagesSeen["$pkg"]=1 _amentPackagesSeen["$pkg"]=1
} }
addEnvHooks "$hostOffset" _findAmentPackages addEnvHooks "$targetOffset" _findAmentPackages
_amentCmakeCorePreConfigureHook() { _amentCmakeCorePreConfigureHook() {
# Don't create share/ament_index/resource_index/parent_prefix_path resource # Don't create share/ament_index/resource_index/parent_prefix_path resource
# that contains references to all dependencies. This file isn't used with Nix # that contains references to all dependencies. This file isn't used with Nix
# and just bloats the closure. # and just bloats the closure.
cmakeFlags+=" -DAMENT_CMAKE_ENVIRONMENT_PARENT_PREFIX_PATH_GENERATION=OFF" cmakeFlags+=" -DAMENT_CMAKE_ENVIRONMENT_PARENT_PREFIX_PATH_GENERATION:BOOL=OFF"
# Point CMake at build platform Python so it can run it at build time
cmakeFlags+=" -DPython@python_major@_EXECUTABLE:FILEPATH=@python_executable@"
} }
preConfigureHooks+=(_amentCmakeCorePreConfigureHook) preConfigureHooks+=(_amentCmakeCorePreConfigureHook)

10
distros/distro-overlay.nix
View file

@ -51,8 +51,14 @@ let
}) ]; }) ];
}); });
ament-cmake-core = rosSuper.ament-cmake-core.overrideAttrs ({ ... }: { ament-cmake-core = rosSuper.ament-cmake-core.overrideAttrs ({
setupHook = ./ament-cmake-core-setup-hook.sh; propagatedBuildInputs ? [],
nativeBuildInputs ? [], ...
}: let
setupHook = rosSelf.callPackage ./ament-cmake-core-setup-hook { };
in {
propagatedBuildInputs = [ setupHook ] ++ propagatedBuildInputs;
nativeBuildInputs = [ setupHook ] ++ nativeBuildInputs;
}); });
camera-calibration-parsers = patchBoostPython rosSuper.camera-calibration-parsers; camera-calibration-parsers = patchBoostPython rosSuper.camera-calibration-parsers;