Merge pull request #18394 from groxxda/gazebo

gazeboSimulator: fix builds
This commit is contained in:
Domen Kožar 2016-09-07 14:57:15 +02:00 committed by GitHub
commit 72f4bc9cf9
2 changed files with 8 additions and 0 deletions

View File

@ -15,6 +15,10 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ cppzmq ]; propagatedBuildInputs = [ cppzmq ];
postPatch = ''
substituteInPlace cmake/ignition-config.cmake.in --replace "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_" "@CMAKE_INSTALL_"
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = http://ignitionrobotics.org/libraries/math; homepage = http://ignitionrobotics.org/libraries/math;
description = "Math library by Ingition Robotics, created for the Gazebo project"; description = "Math library by Ingition Robotics, created for the Gazebo project";

View File

@ -16,6 +16,10 @@ stdenv.mkDerivation rec {
inherit name; inherit name;
prePatch = ''
substituteInPlace cmake/sdf_config.cmake.in --replace "@CMAKE_INSTALL_PREFIX@/@LIB_INSTALL_DIR@" "@LIB_INSTALL_DIR@"
'';
enableParallelBuilding = true; enableParallelBuilding = true;
buildInputs = [ buildInputs = [
cmake boost ruby ignition.math2 tinyxml cmake boost ruby ignition.math2 tinyxml