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

Make catkin propagate cmake.

Browse source
This commit is contained in:
Ben Wolsieffer 2019-05-12 19:37:25 -04:00
parent b8b9c3dd5e
commit f32d66b831
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
build-ros-package/default.nix
View file

@ -1,11 +1,9 @@
{ stdenv, python, cmake }: { stdenv, python, cmake }:
{ nativeBuildInputs ? [] { nativeBuildInputs ? []
, propagatedNativeBuildInputs ? []
, passthru ? {} , passthru ? {}
, ... , ...
}@args: stdenv.mkDerivation (args // { }@args: stdenv.mkDerivation (args // {
nativeBuildInputs = [ python.pkgs.wrapPython ] ++ nativeBuildInputs; nativeBuildInputs = [ python.pkgs.wrapPython ] ++ nativeBuildInputs;
propagatedNativeBuildInputs = [ cmake ] ++ propagatedNativeBuildInputs;
passthru = passthru // { passthru = passthru // {
rosPackage = true; rosPackage = true;

2
distro-overlay.nix
View file

@ -40,11 +40,13 @@ let
}); });
catkin = rosSuper.catkin.overrideAttrs ({ catkin = rosSuper.catkin.overrideAttrs ({
propagatedBuildInputs ? [],
prePhases ? [], prePhases ? [],
postPatch ? "", ... postPatch ? "", ...
}: let }: let
setupHook = self.callPackage ./catkin-setup-hook { } distro; setupHook = self.callPackage ./catkin-setup-hook { } distro;
in { in {
propagatedBuildInputs = [ self.cmake ] ++ propagatedBuildInputs;
prePhases = prePhases ++ [ "setupPhase" ]; prePhases = prePhases ++ [ "setupPhase" ];
# Catkin uses its own setup hook # Catkin uses its own setup hook
setupPhase = '' setupPhase = ''