Unverified Commit 3518b4ac authored by Dmitry Kalinkin's avatar Dmitry Kalinkin Committed by GitHub
Browse files

Merge pull request #182037 from veprbl/pr/root_6_26_04 

root: 6.24.06 -> 6.26.04
parents 39ad761c b3df13e2

pkgs/applications/science/misc/root/default.nix

+17 −10
Original line number Diff line number Diff line
@@ -40,13 +40,27 @@ 
, noSplash ? false

}:



let



  _llvm_9 = llvm_9.overrideAttrs (prev: {

    patches = (prev.patches or []) ++ [

      (fetchpatch {

        url = "https://github.com/root-project/root/commit/a9c961cf4613ff1f0ea50f188e4a4b0eb749b17d.diff";

        stripLen = 3;

        hash = "sha256-LH2RipJICEDWOr7JzX5s0QiUhEwXNMFEJihYKy9qWpo=";

      })

    ];

  });



in



stdenv.mkDerivation rec {

  pname = "root";

  version = "6.24.06";

  version = "6.26.04";



  src = fetchurl {

    url = "https://root.cern.ch/download/root_v${version}.source.tar.gz";

    sha256 = "sha256-kH9p9LrKHk8w7rSXlZjKdZm2qoA8oEboDiW2u6oO9SI=";

    hash = "sha256-onHPgngtbtLIfqXu9mgYA/LmnhezA2352GNjbpNYQh4=";

  };



  nativeBuildInputs = [ makeWrapper cmake pkg-config git ];
@@ -59,7 +73,7 @@ stdenv.mkDerivation rec { 
    zstd

    lapack

    libxml2

    llvm_9

    _llvm_9

    lz4

    xz

    gsl
@@ -80,13 +94,6 @@ stdenv.mkDerivation rec { 


  patches = [

    ./sw_vers.patch



    # Fix builtin_llvm=OFF support

    (fetchpatch {

      url = "https://github.com/root-project/root/commit/0cddef5d3562a89fe254e0036bb7d5ca8a5d34d2.diff";

      excludes = [ "interpreter/cling/tools/plugins/clad/CMakeLists.txt" ];

      sha256 = "sha256-VxWUbxRHB3O6tERFQdbGI7ypDAZD3sjSi+PYfu1OAbM=";

    })

  ];



  # Fix build against vanilla LLVM 9