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

Cleanup catkin setup hook.

Browse source
This commit is contained in:
Ben Wolsieffer 2020-03-04 17:18:10 -05:00
parent db3ae84456
commit cdcb85b14e
3 changed files with 3 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
distros/build-ros-package/default.nix
View file

@ -18,8 +18,6 @@ else stdenv.mkDerivation) (args // {
passthru = passthru // { passthru = passthru // {
rosPackage = true; rosPackage = true;
}; };
} // (if buildType == "ament_python" then { } // lib.optionalAttrs (buildType == "ament_python") {
dontUseCmakeConfigure = true; dontUseCmakeConfigure = true;
} else { })
nativeBuildInputs = [ pythonPackages.wrapPython ] ++ nativeBuildInputs;
}))

5
distros/catkin-setup-hook/default.nix
View file

@ -1,10 +1,5 @@
{ makeSetupHook }: { makeSetupHook }:
distro:
makeSetupHook { makeSetupHook {
name = "catkin-setup-hook"; name = "catkin-setup-hook";
substitutions = {
inherit distro;
};
} ./setup-hook.sh } ./setup-hook.sh

2
distros/distro-overlay.nix
View file

@ -38,7 +38,7 @@ let
prePhases ? [], prePhases ? [],
postPatch ? "", ... postPatch ? "", ...
}: let }: let
setupHook = self.callPackage ./catkin-setup-hook { } distro; setupHook = self.callPackage ./catkin-setup-hook { };
in { in {
propagatedBuildInputs = [ self.cmake setupHook ] ++ propagatedBuildInputs; propagatedBuildInputs = [ self.cmake setupHook ] ++ propagatedBuildInputs;