From 8ba53ffa1622695fe02626704b3991600167a267 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 24 Dec 2016 11:48:07 +0100 Subject: [PATCH] switch more packages back to boost-1.60 They don't build with 1.62. --- pkgs/top-level/all-packages.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 77164a08bbc4..d2e46a84a05a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { };