gplates: use boost 160

update 161 changed reference parameters for optional https://hydra.nixos.org/build/49707856/nixlog/1 http://www.boost.org/doc/libs/1_61_0/libs/optional/doc/html/boost_ooptional/relnotes.html (cherry picked from commit e17d3d4)
NixOS · Mar 8, 2017 · ade5837 · ade5837
1 parent 0ccfb44
commit ade5837
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/pkgs/applications/science/misc/gplates/default.nix b/pkgs/applications/science/misc/gplates/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, qt4, qwt6_qt4, mesa, glew, gdal_1_11, cgal
-, proj, boost159, cmake, python2, doxygen, graphviz, gmp }:
+, proj, boost, cmake, python2, doxygen, graphviz, gmp }:
 
 stdenv.mkDerivation rec {
   name = "gplates-${version}";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    qt4 qwt6_qt4 mesa glew gdal_1_11 cgal proj boost159 cmake python2
+    qt4 qwt6_qt4 mesa glew gdal_1_11 cgal proj boost cmake python2
     doxygen graphviz gmp
   ];
 

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -17415,7 +17415,10 @@ with pkgs;
 
   fityk = callPackage ../applications/science/misc/fityk { };
 
-  gplates = callPackage ../applications/science/misc/gplates { };
+  gplates = callPackage ../applications/science/misc/gplates {
+    boost = boost160;
+    cgal = cgal.override { boost = boost160; };
+  };
 
   gravit = callPackage ../applications/science/astronomy/gravit { };