1 files changed, 7 insertions, 20 deletions
diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix
index e61cb557e123..9795604bab14 100644
--- a/pkgs/applications/science/misc/root/default.nix
+++ b/pkgs/applications/science/misc/root/default.nix
@@ -1,31 +1,18 @@
-{ stdenv, fetchurl, fetchpatch, cmake, pkgconfig, mesa, gfortran
-, libX11,libXpm, libXft, libXext, zlib }:
+{ stdenv, fetchurl, fetchpatch, cmake, pkgconfig, python
+, libX11, libXpm, libXft, libXext, zlib }:
 
 stdenv.mkDerivation rec {
   name = "root-${version}";
-  version = "5.34.15";
+  version = "6.04.16";
 
   src = fetchurl {
-    url = "ftp://root.cern.ch/root/root_v${version}.source.tar.gz";
-    sha256 = "1bkiggcyya39a794d3d2rzzmmkbdymf86hbqhh0l1pl4f38xvp6i";
+    url = "https://root.cern.ch/download/root_v${version}.source.tar.gz";
+    sha256 = "0f58dg83aqhggkxmimsfkd1qyni2vhmykq4qa89cz6jr9p73i1vm";
   };
 
-  buildInputs = [ cmake pkgconfig gfortran mesa libX11 libXpm libXft libXext zlib ];
+  buildInputs = [ cmake pkgconfig python libX11 libXpm libXft libXext zlib ];
 
-  NIX_CFLAGS_LINK = "-lX11";
-
-  # 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
-    (fetchpatch {
-      name = "fix-tm_t-member.diff";
-      url = "https://github.com/root-mirror/root/commit/"
-        + "08b08412bafc24fa635b0fdb832097a3aa2fa1d2.diff";
-      sha256 = "0apbp51pk8471gl06agx3i88dn76p6gpkgf1ssfhcyam0bjl8907";
-    })
-  ];
+  cmakeFlags = "-Drpath=ON";
 
   enableParallelBuilding = true;