From b6be650608084455c64111718de235efccec030c Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Tue, 6 Sep 2016 21:08:42 +0200 Subject: [PATCH 1/2] gazebo.sdformat: fix cmake file --- pkgs/development/libraries/sdformat/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/sdformat/default.nix b/pkgs/development/libraries/sdformat/default.nix index a81ba17a3f5b..692de29afd7a 100644 --- a/pkgs/development/libraries/sdformat/default.nix +++ b/pkgs/development/libraries/sdformat/default.nix @@ -16,6 +16,10 @@ stdenv.mkDerivation rec { inherit name; + prePatch = '' + substituteInPlace cmake/sdf_config.cmake.in --replace "@CMAKE_INSTALL_PREFIX@/@LIB_INSTALL_DIR@" "@LIB_INSTALL_DIR@" + ''; + enableParallelBuilding = true; buildInputs = [ cmake boost ruby ignition.math2 tinyxml From 7a623aec4700edb1fa410607aadf6ce238f6d5dd Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Wed, 7 Sep 2016 14:24:18 +0200 Subject: [PATCH 2/2] ignition-transport: fix cmake file --- pkgs/development/libraries/ignition-transport/generic.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/ignition-transport/generic.nix b/pkgs/development/libraries/ignition-transport/generic.nix index 0b10c2cdb52f..5edbf9e4551c 100644 --- a/pkgs/development/libraries/ignition-transport/generic.nix +++ b/pkgs/development/libraries/ignition-transport/generic.nix @@ -15,6 +15,10 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ cppzmq ]; + postPatch = '' + substituteInPlace cmake/ignition-config.cmake.in --replace "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_" "@CMAKE_INSTALL_" + ''; + meta = with stdenv.lib; { homepage = http://ignitionrobotics.org/libraries/math; description = "Math library by Ingition Robotics, created for the Gazebo project";