diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-12-24 11:48:07 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-12-24 11:48:42 +0100 |
| commit | 8ba53ffa1622695fe02626704b3991600167a267 (patch) | |
| tree | 8431c93e5fce25e608f13fd5d3fbddfb1a85b46d /pkgs/top-level/all-packages.nix | |
| parent | c4236f65b9319fe176103c3ba65ed5c9c3228103 (diff) | |
| download | nixlib-8ba53ffa1622695fe02626704b3991600167a267.tar nixlib-8ba53ffa1622695fe02626704b3991600167a267.tar.gz nixlib-8ba53ffa1622695fe02626704b3991600167a267.tar.bz2 nixlib-8ba53ffa1622695fe02626704b3991600167a267.tar.lz nixlib-8ba53ffa1622695fe02626704b3991600167a267.tar.xz nixlib-8ba53ffa1622695fe02626704b3991600167a267.tar.zst nixlib-8ba53ffa1622695fe02626704b3991600167a267.zip | |
switch more packages back to boost-1.60
They don't build with 1.62.
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 11 |
1 files 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 { }; |