diff options
Diffstat (limited to 'pkgs/applications/science/misc/root/default.nix')
-rw-r--r-- | pkgs/applications/science/misc/root/default.nix | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index 9fe06f6d7969..ee3610c5f6f6 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { pname = "root"; - version = "6.28.10"; + version = "6.30.02"; passthru = { tests = import ./tests { inherit callPackage; }; @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://root.cern.ch/download/root_v${version}.source.tar.gz"; - hash = "sha256-adb962B+ayC9AsdX+mIXAkwLYTLB6bHf9Nhdmiu35R4="; + hash = "sha256-eWWkVtGtHuDV/kdpv1qP7Cka9oTtk9sPMICpw2JDUYM="; }; nativeBuildInputs = [ makeWrapper cmake pkg-config git ]; @@ -110,6 +110,13 @@ stdenv.mkDerivation rec { patches = [ ./sw_vers.patch + + # Fix for builtin_llvm=OFF + # https://github.com/root-project/root/pull/14238 + (fetchpatch { + url = "https://github.com/root-project/root/commit/1477d3adebf27a19f3a8b85f21c27a0a5649c7ff.diff"; + hash = "sha256-g+FqXBTWXA7t7F/rMarnmOK2014oCNnNJbHhjH+Tvjw="; + }) ]; preConfigure = '' @@ -121,7 +128,7 @@ stdenv.mkDerivation rec { substituteInPlace cmake/modules/SearchInstalledSoftware.cmake \ --replace 'set(lcgpackages ' '#set(lcgpackages ' - substituteInPlace interpreter/llvm/src/tools/clang/tools/driver/CMakeLists.txt \ + substituteInPlace interpreter/llvm-project/clang/tools/driver/CMakeLists.txt \ --replace 'add_clang_symlink(''${link} clang)' "" # Don't require textutil on macOS @@ -136,8 +143,8 @@ stdenv.mkDerivation rec { substituteInPlace rootx/src/rootx.cxx --replace "gNoLogo = false" "gNoLogo = true" '' + lib.optionalString stdenv.isDarwin '' # Eliminate impure reference to /System/Library/PrivateFrameworks - substituteInPlace core/CMakeLists.txt \ - --replace "-F/System/Library/PrivateFrameworks" "" + substituteInPlace core/macosx/CMakeLists.txt \ + --replace "-F/System/Library/PrivateFrameworks " "" '' + lib.optionalString (stdenv.isDarwin && lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11") '' MACOSX_DEPLOYMENT_TARGET=10.16 ''; @@ -184,6 +191,7 @@ stdenv.mkDerivation rec { "-Dsqlite=OFF" "-Dssl=ON" "-Dtmva=ON" + "-Dtmva-pymva=OFF" "-Dvdt=OFF" "-Dwebgui=ON" "-Dxml=ON" |