Merge pull request #48675 from veprbl/pr/xfitter_fix
xfitter: runtime fixes
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchFromGitHub, autoreconfHook, apfel, applgrid, lhapdf, root }:
|
||||
{ stdenv, fetchFromGitHub, autoreconfHook, apfel, applgrid, lhapdf, root5 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "apfelgrid-${version}";
|
||||
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
buildInputs = [ apfel applgrid lhapdf root ];
|
||||
buildInputs = [ apfel applgrid lhapdf root5 ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "QCDNUM-${version}";
|
||||
version = "17-01-14";
|
||||
version = "17-01-13";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.nikhef.nl/user/h24/qcdnum-files/download/qcdnum${builtins.replaceStrings ["-"] [""] version}.tar.gz";
|
||||
sha256 = "199s6kgmszxgjzd9214mpx3kyplq2q6987sii67s5xkg10ynyv31";
|
||||
sha256 = "0568rjviwvjkfihq2ka7g91vmialr31ryn7c69iqf13rcv5vzcw7";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ gfortran ];
|
||||
|
||||
Reference in New Issue
Block a user