1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-24 22:50:49 +00:00

switch more packages back to boost-1.60

They don't build with 1.62.
This commit is contained in:
Vladimír Čunát 2016-12-24 11:48:07 +01:00
parent c4236f65b9
commit 8ba53ffa16
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA

View file

@ -1804,16 +1804,16 @@ in
gawp = callPackage ../tools/misc/gawp { };
gazeboSimulator = recurseIntoAttrs {
gazeboSimulator = recurseIntoAttrs rec {
sdformat = gazeboSimulator.sdformat4;
sdformat3 = callPackage ../development/libraries/sdformat/3.nix { };
sdformat4 = callPackage ../development/libraries/sdformat { };
gazebo6 = callPackage ../applications/science/robotics/gazebo/6.nix { };
gazebo6 = callPackage ../applications/science/robotics/gazebo/6.nix { boost = boost160; };
gazebo6-headless = callPackage ../applications/science/robotics/gazebo/6.nix { withHeadless = true; };
gazebo6-headless = gazebo6.override { withHeadless = true; };
gazebo7 = callPackage ../applications/science/robotics/gazebo { };
@ -4959,7 +4959,9 @@ in
hxcpp = callPackage ../development/compilers/haxe/hxcpp.nix { };
hhvm = callPackage ../development/compilers/hhvm { };
hhvm = callPackage ../development/compilers/hhvm {
boost = boost160;
};
hop = callPackage ../development/compilers/hop { };
@ -16938,6 +16940,7 @@ in
kicad = callPackage ../applications/science/electronics/kicad {
wxGTK = wxGTK30;
boost = boost160;
};
ngspice = callPackage ../applications/science/electronics/ngspice { };