Skip to content

Commit ade5837

Browse files
rardioldezgeg
authored andcommittedMar 8, 2017
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)
1 parent 0ccfb44 commit ade5837

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed
 

Diff for: ‎pkgs/applications/science/misc/gplates/default.nix

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{ stdenv, fetchurl, qt4, qwt6_qt4, mesa, glew, gdal_1_11, cgal
2-
, proj, boost159, cmake, python2, doxygen, graphviz, gmp }:
2+
, proj, boost, cmake, python2, doxygen, graphviz, gmp }:
33

44
stdenv.mkDerivation rec {
55
name = "gplates-${version}";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
1515
];
1616

1717
buildInputs = [
18-
qt4 qwt6_qt4 mesa glew gdal_1_11 cgal proj boost159 cmake python2
18+
qt4 qwt6_qt4 mesa glew gdal_1_11 cgal proj boost cmake python2
1919
doxygen graphviz gmp
2020
];
2121

Diff for: ‎pkgs/top-level/all-packages.nix

+4-1
Original file line numberDiff line numberDiff line change
@@ -17415,7 +17415,10 @@ with pkgs;
1741517415

1741617416
fityk = callPackage ../applications/science/misc/fityk { };
1741717417

17418-
gplates = callPackage ../applications/science/misc/gplates { };
17418+
gplates = callPackage ../applications/science/misc/gplates {
17419+
boost = boost160;
17420+
cgal = cgal.override { boost = boost160; };
17421+
};
1741917422

1742017423
gravit = callPackage ../applications/science/astronomy/gravit { };
1742117424

0 commit comments

Comments
 (0)