From e17d3d4ef1c777b9b4ea9724d4dcc1631832bdc1 Mon Sep 17 00:00:00 2001 From: Ricardo Ardissone Date: Sat, 4 Mar 2017 10:29:16 -0300 Subject: [PATCH] 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 --- pkgs/applications/science/misc/gplates/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/misc/gplates/default.nix b/pkgs/applications/science/misc/gplates/default.nix index 7fa0c3f6865..05e0091108a 100644 --- 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 index 6b01b111f23..12504c5099e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { };