pyrox.dev
root: fix build by upstream patch
Also refactor the expression a little.
+2
-2
pkgs/applications/science/misc/root/cmake.patch
+2
-2
pkgs/applications/science/misc/root/cmake.patch
···
1
-
--- cmake/modules/RootBuildOptions.cmake 1969-12-31 20:30:01.000000000 -0330
2
-
+++ cmake/modules/RootBuildOptions.cmake 2014-01-10 14:09:29.424937408 -0330
1
+
--- a/cmake/modules/RootBuildOptions.cmake 1969-12-31 20:30:01.000000000 -0330
2
+
+++ b/cmake/modules/RootBuildOptions.cmake 2014-01-10 14:09:29.424937408 -0330
3
3
@@ -149,7 +149,7 @@
4
4
5
5
#---General Build options----------------------------------------------------------------------
+11
-3
pkgs/applications/science/misc/root/default.nix
+11
-3
pkgs/applications/science/misc/root/default.nix
···
1
-
{ stdenv, fetchurl, cmake, mesa, libX11, gfortran, libXpm, libXft, libXext, zlib }:
1
+
{ stdenv, fetchurl, fetchpatch, cmake, mesa, gfortran
2
+
, libX11,libXpm, libXft, libXext, zlib }:
2
3
3
4
stdenv.mkDerivation rec {
4
5
name = "root-${version}";
···
14
15
# CMAKE_INSTALL_RPATH_USE_LINK_PATH is set to FALSE in
15
16
# <rootsrc>/cmake/modules/RootBuildOptions.cmake.
16
17
# This patch sets it to TRUE.
17
-
patches = [ ./cmake.patch ];
18
-
patchFlags = "-p0";
18
+
patches = [
19
+
./cmake.patch
20
+
(fetchpatch {
21
+
name = "fix-tm_t-member.diff";
22
+
url = "https://github.com/root-mirror/root/commit/"
23
+
+ "08b08412bafc24fa635b0fdb832097a3aa2fa1d2.diff";
24
+
sha256 = "0apbp51pk8471gl06agx3i88dn76p6gpkgf1ssfhcyam0bjl8907";
25
+
})
26
+
];
19
27
20
28
enableParallelBuilding = true;
21
29