diff --git a/pkgs/applications/science/physics/MCFM/default.nix b/pkgs/by-name/mc/MCFM/package.nix similarity index 68% rename from pkgs/applications/science/physics/MCFM/default.nix rename to pkgs/by-name/mc/MCFM/package.nix index 98b028c4da75..4ed8058f37d2 100644 --- a/pkgs/applications/science/physics/MCFM/default.nix +++ b/pkgs/by-name/mc/MCFM/package.nix @@ -1,12 +1,18 @@ { lib, - stdenv, fetchurl, cmake, gfortran, + gccStdenv, lhapdf, }: - +let + stdenv = gccStdenv; + lhapdf' = lhapdf.override { + stdenv = gccStdenv; + python3 = null; + }; +in stdenv.mkDerivation rec { pname = "MCFM"; version = "10.0.1"; @@ -18,15 +24,19 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace CMakeLists.txt \ - --replace 'target_link_libraries(mcfm lhapdf_lib)' \ + --replace-fail 'target_link_libraries(mcfm lhapdf_lib)' \ 'target_link_libraries(mcfm ''${lhapdf_lib})' + + substituteInPlace qcdloop-2.0.5/CMakeLists.txt \ + --replace-fail 'cmake_minimum_required (VERSION 3.0.2)' \ + 'cmake_minimum_required (VERSION 3.15)' ''; nativeBuildInputs = [ cmake gfortran ]; - buildInputs = [ lhapdf ]; + buildInputs = [ lhapdf' ]; cmakeFlags = [ "-Duse_external_lhapdf=ON" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e012505a0156..6ab4fb2e4518 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12069,14 +12069,6 @@ with pkgs; ### SCIENCE/PHYSICS - mcfm = callPackage ../applications/science/physics/MCFM { - stdenv = gccStdenv; - lhapdf = lhapdf.override { - stdenv = gccStdenv; - python3 = null; - }; - }; - xflr5 = libsForQt5.callPackage ../applications/science/physics/xflr5 { }; ### SCIENCE/LOGIC