pyrox.dev
Merge pull request #136016 from veprbl/pr/root_6_24_04
root: 6.24.02 -> 6.24.06
authored by
Dmitry Kalinkin
and committed by
GitHub
84f408f2
f16e0e1a
+24
-3
pkgs/applications/science/misc/root/default.nix
+24
-3
pkgs/applications/science/misc/root/default.nix
···
1
1
{ stdenv
2
2
, lib
3
3
, fetchurl
4
+
, fetchpatch
4
5
, makeWrapper
5
6
, cmake
6
7
, git
···
15
16
, libGLU
16
17
, libGL
17
18
, libxml2
19
+
, llvm_9
18
20
, lz4
19
21
, xz
20
22
, pcre
···
29
31
, libjpeg
30
32
, libtiff
31
33
, libpng
34
+
, tbb
32
35
, Cocoa
33
36
, CoreSymbolication
34
37
, OpenGL
···
37
40
38
41
stdenv.mkDerivation rec {
39
42
pname = "root";
40
-
version = "6.24.02";
43
+
version = "6.24.06";
41
44
42
45
src = fetchurl {
43
46
url = "https://root.cern.ch/download/root_v${version}.source.tar.gz";
44
-
sha256 = "sha256-BQfhCV4nnMxyQPZR0llmAkMlF5+oWhJZtpS1ZyOtfBw=";
47
+
sha256 = "sha256-kH9p9LrKHk8w7rSXlZjKdZm2qoA8oEboDiW2u6oO9SI=";
45
48
};
46
49
47
50
nativeBuildInputs = [ makeWrapper cmake pkg-config git ];
···
53
56
zlib
54
57
zstd
55
58
libxml2
59
+
llvm_9
56
60
lz4
57
61
xz
58
62
gsl
···
64
68
libpng
65
69
nlohmann_json
66
70
python.pkgs.numpy
71
+
tbb
67
72
]
68
73
++ lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU libGL ]
69
74
++ lib.optionals (stdenv.isDarwin) [ Cocoa CoreSymbolication OpenGL ]
···
71
76
72
77
patches = [
73
78
./sw_vers.patch
79
+
80
+
# Fix builtin_llvm=OFF support
81
+
(fetchpatch {
82
+
url = "https://github.com/root-project/root/commit/0cddef5d3562a89fe254e0036bb7d5ca8a5d34d2.diff";
83
+
excludes = [ "interpreter/cling/tools/plugins/clad/CMakeLists.txt" ];
84
+
sha256 = "sha256-VxWUbxRHB3O6tERFQdbGI7ypDAZD3sjSi+PYfu1OAbM=";
85
+
})
74
86
];
87
+
88
+
# Fix build against vanilla LLVM 9
89
+
postPatch = ''
90
+
sed \
91
+
-e '/#include "llvm.*RTDyldObjectLinkingLayer.h"/i#define private protected' \
92
+
-e '/#include "llvm.*RTDyldObjectLinkingLayer.h"/a#undef private' \
93
+
-i interpreter/cling/lib/Interpreter/IncrementalJIT.h
94
+
'';
75
95
76
96
preConfigure = ''
77
97
rm -rf builtins/*
···
99
119
"-DCMAKE_CXX_STANDARD=17"
100
120
"-DCMAKE_INSTALL_LIBDIR=lib"
101
121
"-DCMAKE_INSTALL_INCLUDEDIR=include"
122
+
"-Dbuiltin_llvm=OFF"
102
123
"-Dbuiltin_nlohmannjson=OFF"
103
124
"-Dbuiltin_openui5=OFF"
104
125
"-Dalien=OFF"
···
112
133
"-Dfftw3=OFF"
113
134
"-Dfitsio=OFF"
114
135
"-Dfortran=OFF"
115
-
"-Dimt=OFF"
136
+
"-Dimt=ON"
116
137
"-Dgfal=OFF"
117
138
"-Dgviz=OFF"
118
139
"-Dhdfs=OFF"