diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-12-10 12:59:24 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-12-10 13:03:01 +0100 |
| commit | 7ce485ff0fe8f7347db0609d82532bd7dc839c8a (patch) | |
| tree | 58919922625e373721f099c1aaa9b319228d634f /pkgs/applications/science/misc | |
| parent | 73ef06de48c4840de8b92bd4352c9a1f635ad91b (diff) | |
| download | nixlib-7ce485ff0fe8f7347db0609d82532bd7dc839c8a.tar nixlib-7ce485ff0fe8f7347db0609d82532bd7dc839c8a.tar.gz nixlib-7ce485ff0fe8f7347db0609d82532bd7dc839c8a.tar.bz2 nixlib-7ce485ff0fe8f7347db0609d82532bd7dc839c8a.tar.lz nixlib-7ce485ff0fe8f7347db0609d82532bd7dc839c8a.tar.xz nixlib-7ce485ff0fe8f7347db0609d82532bd7dc839c8a.tar.zst nixlib-7ce485ff0fe8f7347db0609d82532bd7dc839c8a.zip | |
root: fix build by upstream patch
Also refactor the expression a little.
Diffstat (limited to 'pkgs/applications/science/misc')
| -rw-r--r-- | pkgs/applications/science/misc/root/cmake.patch | 4 | ||||
| -rw-r--r-- | pkgs/applications/science/misc/root/default.nix | 14 |
2 files changed, 13 insertions, 5 deletions
diff --git a/pkgs/applications/science/misc/root/cmake.patch b/pkgs/applications/science/misc/root/cmake.patch index b6efd7444fe9..6d2d4cdc70d8 100644 --- a/pkgs/applications/science/misc/root/cmake.patch +++ b/pkgs/applications/science/misc/root/cmake.patch @@ -1,5 +1,5 @@ ---- cmake/modules/RootBuildOptions.cmake 1969-12-31 20:30:01.000000000 -0330 -+++ cmake/modules/RootBuildOptions.cmake 2014-01-10 14:09:29.424937408 -0330 +--- a/cmake/modules/RootBuildOptions.cmake 1969-12-31 20:30:01.000000000 -0330 ++++ b/cmake/modules/RootBuildOptions.cmake 2014-01-10 14:09:29.424937408 -0330 @@ -149,7 +149,7 @@ #---General Build options---------------------------------------------------------------------- diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index 1227e76ac0c5..57d9fc40ab50 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, cmake, mesa, libX11, gfortran, libXpm, libXft, libXext, zlib }: +{ stdenv, fetchurl, fetchpatch, cmake, mesa, gfortran +, libX11,libXpm, libXft, libXext, zlib }: stdenv.mkDerivation rec { name = "root-${version}"; @@ -14,8 +15,15 @@ stdenv.mkDerivation rec { # CMAKE_INSTALL_RPATH_USE_LINK_PATH is set to FALSE in # <rootsrc>/cmake/modules/RootBuildOptions.cmake. # This patch sets it to TRUE. - patches = [ ./cmake.patch ]; - patchFlags = "-p0"; + patches = [ + ./cmake.patch + (fetchpatch { + name = "fix-tm_t-member.diff"; + url = "https://github.com/root-mirror/root/commit/" + + "08b08412bafc24fa635b0fdb832097a3aa2fa1d2.diff"; + sha256 = "0apbp51pk8471gl06agx3i88dn76p6gpkgf1ssfhcyam0bjl8907"; + }) + ]; enableParallelBuilding = true; |