JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gplates: use boost 160

Browse Source 
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
This commit is contained in:
Ricardo Ardissone 2017-03-04 10:29:16 -03:00 committed by Tuomas Tynkkynen
parent 2c99575c66
commit e17d3d4ef1
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/science/misc/gplates/default.nix
View File

@ -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
];

5
pkgs/top-level/all-packages.nix
View File

@ -17466,7 +17466,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 { };