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
{ stdenv
2
, lib
3
, fetchurl
4
, makeWrapper
5
, cmake
6
, git
···
15
, libGLU
16
, libGL
17
, libxml2
18
, lz4
19
, xz
20
, pcre
···
29
, libjpeg
30
, libtiff
31
, libpng
32
, Cocoa
33
, CoreSymbolication
34
, OpenGL
···
37
38
stdenv.mkDerivation rec {
39
pname = "root";
40
-
version = "6.24.02";
41
42
src = fetchurl {
43
url = "https://root.cern.ch/download/root_v${version}.source.tar.gz";
44
-
sha256 = "sha256-BQfhCV4nnMxyQPZR0llmAkMlF5+oWhJZtpS1ZyOtfBw=";
45
};
46
47
nativeBuildInputs = [ makeWrapper cmake pkg-config git ];
···
53
zlib
54
zstd
55
libxml2
56
lz4
57
xz
58
gsl
···
64
libpng
65
nlohmann_json
66
python.pkgs.numpy
67
]
68
++ lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU libGL ]
69
++ lib.optionals (stdenv.isDarwin) [ Cocoa CoreSymbolication OpenGL ]
···
71
72
patches = [
73
./sw_vers.patch
74
];
75
76
preConfigure = ''
77
rm -rf builtins/*
···
99
"-DCMAKE_CXX_STANDARD=17"
100
"-DCMAKE_INSTALL_LIBDIR=lib"
101
"-DCMAKE_INSTALL_INCLUDEDIR=include"
102
"-Dbuiltin_nlohmannjson=OFF"
103
"-Dbuiltin_openui5=OFF"
104
"-Dalien=OFF"
···
112
"-Dfftw3=OFF"
113
"-Dfitsio=OFF"
114
"-Dfortran=OFF"
115
-
"-Dimt=OFF"
116
"-Dgfal=OFF"
117
"-Dgviz=OFF"
118
"-Dhdfs=OFF"
···
1
{ stdenv
2
, lib
3
, fetchurl
4
+
, fetchpatch
5
, makeWrapper
6
, cmake
7
, git
···
16
, libGLU
17
, libGL
18
, libxml2
19
+
, llvm_9
20
, lz4
21
, xz
22
, pcre
···
31
, libjpeg
32
, libtiff
33
, libpng
34
+
, tbb
35
, Cocoa
36
, CoreSymbolication
37
, OpenGL
···
40
41
stdenv.mkDerivation rec {
42
pname = "root";
43
+
version = "6.24.06";
44
45
src = fetchurl {
46
url = "https://root.cern.ch/download/root_v${version}.source.tar.gz";
47
+
sha256 = "sha256-kH9p9LrKHk8w7rSXlZjKdZm2qoA8oEboDiW2u6oO9SI=";
48
};
49
50
nativeBuildInputs = [ makeWrapper cmake pkg-config git ];
···
56
zlib
57
zstd
58
libxml2
59
+
llvm_9
60
lz4
61
xz
62
gsl
···
68
libpng
69
nlohmann_json
70
python.pkgs.numpy
71
+
tbb
72
]
73
++ lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU libGL ]
74
++ lib.optionals (stdenv.isDarwin) [ Cocoa CoreSymbolication OpenGL ]
···
76
77
patches = [
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
+
})
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
+
'';
95
96
preConfigure = ''
97
rm -rf builtins/*
···
119
"-DCMAKE_CXX_STANDARD=17"
120
"-DCMAKE_INSTALL_LIBDIR=lib"
121
"-DCMAKE_INSTALL_INCLUDEDIR=include"
122
+
"-Dbuiltin_llvm=OFF"
123
"-Dbuiltin_nlohmannjson=OFF"
124
"-Dbuiltin_openui5=OFF"
125
"-Dalien=OFF"
···
133
"-Dfftw3=OFF"
134
"-Dfitsio=OFF"
135
"-Dfortran=OFF"
136
+
"-Dimt=ON"
137
"-Dgfal=OFF"
138
"-Dgviz=OFF"
139
"-Dhdfs=OFF"