Merge pull request #136016 from veprbl/pr/root_6_24_04
root: 6.24.02 -> 6.24.06
This commit is contained in:
commit
84f408f206
@ -1,6 +1,7 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, makeWrapper
|
||||
, cmake
|
||||
, git
|
||||
@ -15,6 +16,7 @@
|
||||
, libGLU
|
||||
, libGL
|
||||
, libxml2
|
||||
, llvm_9
|
||||
, lz4
|
||||
, xz
|
||||
, pcre
|
||||
@ -29,6 +31,7 @@
|
||||
, libjpeg
|
||||
, libtiff
|
||||
, libpng
|
||||
, tbb
|
||||
, Cocoa
|
||||
, CoreSymbolication
|
||||
, OpenGL
|
||||
@ -37,11 +40,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "root";
|
||||
version = "6.24.02";
|
||||
version = "6.24.06";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://root.cern.ch/download/root_v${version}.source.tar.gz";
|
||||
sha256 = "sha256-BQfhCV4nnMxyQPZR0llmAkMlF5+oWhJZtpS1ZyOtfBw=";
|
||||
sha256 = "sha256-kH9p9LrKHk8w7rSXlZjKdZm2qoA8oEboDiW2u6oO9SI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper cmake pkg-config git ];
|
||||
@ -53,6 +56,7 @@ stdenv.mkDerivation rec {
|
||||
zlib
|
||||
zstd
|
||||
libxml2
|
||||
llvm_9
|
||||
lz4
|
||||
xz
|
||||
gsl
|
||||
@ -64,6 +68,7 @@ stdenv.mkDerivation rec {
|
||||
libpng
|
||||
nlohmann_json
|
||||
python.pkgs.numpy
|
||||
tbb
|
||||
]
|
||||
++ lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU libGL ]
|
||||
++ lib.optionals (stdenv.isDarwin) [ Cocoa CoreSymbolication OpenGL ]
|
||||
@ -71,8 +76,23 @@ stdenv.mkDerivation rec {
|
||||
|
||||
patches = [
|
||||
./sw_vers.patch
|
||||
|
||||
# Fix builtin_llvm=OFF support
|
||||
(fetchpatch {
|
||||
url = "https://github.com/root-project/root/commit/0cddef5d3562a89fe254e0036bb7d5ca8a5d34d2.diff";
|
||||
excludes = [ "interpreter/cling/tools/plugins/clad/CMakeLists.txt" ];
|
||||
sha256 = "sha256-VxWUbxRHB3O6tERFQdbGI7ypDAZD3sjSi+PYfu1OAbM=";
|
||||
})
|
||||
];
|
||||
|
||||
# Fix build against vanilla LLVM 9
|
||||
postPatch = ''
|
||||
sed \
|
||||
-e '/#include "llvm.*RTDyldObjectLinkingLayer.h"/i#define private protected' \
|
||||
-e '/#include "llvm.*RTDyldObjectLinkingLayer.h"/a#undef private' \
|
||||
-i interpreter/cling/lib/Interpreter/IncrementalJIT.h
|
||||
'';
|
||||
|
||||
preConfigure = ''
|
||||
rm -rf builtins/*
|
||||
substituteInPlace cmake/modules/SearchInstalledSoftware.cmake \
|
||||
@ -99,6 +119,7 @@ stdenv.mkDerivation rec {
|
||||
"-DCMAKE_CXX_STANDARD=17"
|
||||
"-DCMAKE_INSTALL_LIBDIR=lib"
|
||||
"-DCMAKE_INSTALL_INCLUDEDIR=include"
|
||||
"-Dbuiltin_llvm=OFF"
|
||||
"-Dbuiltin_nlohmannjson=OFF"
|
||||
"-Dbuiltin_openui5=OFF"
|
||||
"-Dalien=OFF"
|
||||
@ -112,7 +133,7 @@ stdenv.mkDerivation rec {
|
||||
"-Dfftw3=OFF"
|
||||
"-Dfitsio=OFF"
|
||||
"-Dfortran=OFF"
|
||||
"-Dimt=OFF"
|
||||
"-Dimt=ON"
|
||||
"-Dgfal=OFF"
|
||||
"-Dgviz=OFF"
|
||||
"-Dhdfs=OFF"
|
||||
|
Loading…
Reference in New Issue
Block a user