diff options
Diffstat (limited to 'pkgs/applications/science/misc/root/default.nix')
| -rw-r--r-- | pkgs/applications/science/misc/root/default.nix | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index 220b2e06360..726f6352c95 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -1,18 +1,19 @@ { stdenv, fetchurl, fetchpatch, cmake, pcre, pkgconfig, python2 -, libX11, libXpm, libXft, libXext, zlib, lzma, gsl, Cocoa }: +, libX11, libXpm, libXft, libXext, mesa, zlib, libxml2, lzma, gsl +, Cocoa, OpenGL }: stdenv.mkDerivation rec { name = "root-${version}"; - version = "6.08.02"; + version = "6.09.02"; src = fetchurl { url = "https://root.cern.ch/download/root_v${version}.source.tar.gz"; - sha256 = "0530v1r4rvds52hgb13f00l3phhn76z6vii550mwv8bj3sl5070k"; + sha256 = "0fc6b0l7bw66cyckxs4ikvyzcv1zlfx88205jx153smdhih0jj2k"; }; - buildInputs = [ cmake pcre pkgconfig python2 zlib lzma gsl ] - ++ stdenv.lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext ] - ++ stdenv.lib.optionals (stdenv.isDarwin) [ Cocoa ] + buildInputs = [ cmake pcre pkgconfig python2 zlib libxml2 lzma gsl ] + ++ stdenv.lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext mesa ] + ++ stdenv.lib.optionals (stdenv.isDarwin) [ Cocoa OpenGL ] ; patches = [ @@ -20,6 +21,13 @@ stdenv.mkDerivation rec { # this prevents thisroot.sh from setting $p, which interferes with stdenv setup ./thisroot.patch + + # https://sft.its.cern.ch/jira/browse/ROOT-8728 + (fetchpatch { + url = "https://sft.its.cern.ch/jira/secure/attachment/20025/0001-std-string_view-has-no-more-to_string.patch"; + sha256 = "0ngyk960xfrcsj4vhr1ax8h85fx0g1cfycxi3k35a6ych2zmyg8q"; + }) + ./ROOT-8728-extra.patch ]; preConfigure = '' @@ -47,7 +55,7 @@ stdenv.mkDerivation rec { "-Dmonalisa=OFF" "-Dmysql=OFF" "-Dodbc=OFF" - "-Dopengl=OFF" + "-Dopengl=ON" "-Doracle=OFF" "-Dpgsql=OFF" "-Dpythia6=OFF" @@ -55,7 +63,7 @@ stdenv.mkDerivation rec { "-Drfio=OFF" "-Dsqlite=OFF" "-Dssl=OFF" - "-Dxml=OFF" + "-Dxml=ON" "-Dxrootd=OFF" ] ++ stdenv.lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${stdenv.lib.getDev stdenv.cc.libc}/include"; |