movefasta/nix-ros-overlay
1
0
Fork 0
mirror of https://github.com/lopsided98/nix-ros-overlay.git synced 2025-06-10 01:42:24 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use makeWrapper as a native build input

Browse source 
Fixes cross-compilation
This commit is contained in:
Jeremy Kolb 2022-07-08 13:57:42 -04:00 • committed by Ben Wolsieffer
parent bb7b9e3723
commit a6cc2182f7
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
distros/build-env/default.nix
View file

@ -43,7 +43,7 @@ let
# nix-shell -p does. # nix-shell -p does.
paths = propagatedPaths.rosPackages; paths = propagatedPaths.rosPackages;
buildInputs = optional wrapPrograms makeWrapper; nativeBuildInputs = optional wrapPrograms makeWrapper;
postBuild = '' postBuild = ''
"${buildPackages.perl}/bin/perl" "${./setup-hook-builder.pl}" "${buildPackages.perl}/bin/perl" "${./setup-hook-builder.pl}"

3
pkgs/colcon/core.nix
View file

@ -7,7 +7,8 @@ let
pname = "colcon"; pname = "colcon";
inherit (package) version; inherit (package) version;
phases = [ "installPhase" "fixupPhase" ]; phases = [ "installPhase" "fixupPhase" ];
buildInputs = [ makeWrapper package] ++ extensions; nativeBuildInputs = [ makeWrapper ];
buildInputs = [ package ] ++ extensions;
installPhase = '' installPhase = ''
makeWrapper '${package}/bin/colcon' "$out/bin/colcon" \ makeWrapper '${package}/bin/colcon' "$out/bin/colcon" \