root: 6.30.02 -> 6.30.04 (#285339)
This commit is contained in:
parent
6c22593ad4
commit
f125235a38
@ -2,7 +2,6 @@
|
||||
, lib
|
||||
, callPackage
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, makeWrapper
|
||||
, cmake
|
||||
, coreutils
|
||||
@ -58,7 +57,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "root";
|
||||
version = "6.30.02";
|
||||
version = "6.30.04";
|
||||
|
||||
passthru = {
|
||||
tests = import ./tests { inherit callPackage; };
|
||||
@ -66,7 +65,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://root.cern.ch/download/root_v${version}.source.tar.gz";
|
||||
hash = "sha256-eWWkVtGtHuDV/kdpv1qP7Cka9oTtk9sPMICpw2JDUYM=";
|
||||
hash = "sha256-K0GAtpjznMZdkQhNgzqIRRWzJbxfZzyOOavoGLAl2Mw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper cmake pkg-config git ];
|
||||
@ -110,13 +109,6 @@ stdenv.mkDerivation rec {
|
||||
|
||||
patches = [
|
||||
./sw_vers.patch
|
||||
|
||||
# Fix for builtin_llvm=OFF
|
||||
# https://github.com/root-project/root/pull/14238
|
||||
(fetchpatch {
|
||||
url = "https://github.com/root-project/root/commit/1477d3adebf27a19f3a8b85f21c27a0a5649c7ff.diff";
|
||||
hash = "sha256-g+FqXBTWXA7t7F/rMarnmOK2014oCNnNJbHhjH+Tvjw=";
|
||||
})
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
|
Loading…
Reference in New Issue
Block a user