Merge pull request #18394 from groxxda/gazebo

pyrox.dev / nixpkgs

fork atom

lol

fork atom

gazeboSimulator: fix builds

authored by

Domen Kožar and committed by

GitHub 9 years ago 72f4bc9c 8c3e9ea5

2 changed files

expand all

unified split

pkgs

development

libraries

ignition-transport

generic.nix

sdformat

default.nix

pkgs/development/libraries/ignition-transport/generic.nix

··· 15 15 16 16 propagatedBuildInputs = [ cppzmq ]; 17 17 18 + postPatch = '' 19 + substituteInPlace cmake/ignition-config.cmake.in --replace "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_" "@CMAKE_INSTALL_" 20 + ''; 21 + 18 22 meta = with stdenv.lib; { 19 23 homepage = http://ignitionrobotics.org/libraries/math; 20 24 description = "Math library by Ingition Robotics, created for the Gazebo project";

pkgs/development/libraries/sdformat/default.nix

··· 16 16 17 17 inherit name; 18 18 19 + prePatch = '' 20 + substituteInPlace cmake/sdf_config.cmake.in --replace "@CMAKE_INSTALL_PREFIX@/@LIB_INSTALL_DIR@" "@LIB_INSTALL_DIR@" 21 + ''; 22 + 19 23 enableParallelBuilding = true; 20 24 buildInputs = [ 21 25 cmake boost ruby ignition.math2 tinyxml