diff --git a/pkgs/applications/science/physics/MCFM/default.nix b/pkgs/by-name/mc/mcfm/package.nix
similarity index 52%
rename from pkgs/applications/science/physics/MCFM/default.nix
rename to pkgs/by-name/mc/mcfm/package.nix
index 98b028c4da75..ef149b53a875 100644
--- a/pkgs/applications/science/physics/MCFM/default.nix
+++ b/pkgs/by-name/mc/mcfm/package.nix
@@ -1,32 +1,42 @@
 {
   lib,
-  stdenv,
   fetchurl,
   cmake,
   gfortran,
+  gccStdenv,
   lhapdf,
 }:
-
-stdenv.mkDerivation rec {
+let
+  stdenv = gccStdenv;
+  lhapdf' = lhapdf.override {
+    stdenv = gccStdenv;
+    python3 = null;
+  };
+in
+stdenv.mkDerivation (finalAttrs: {
   pname = "MCFM";
   version = "10.0.1";
 
   src = fetchurl {
-    url = "https://mcfm.fnal.gov/downloads/${pname}-${version}.tar.gz";
-    sha256 = "sha256-3Dg4KoILb0XhgGkzItDh/1opCtYrrIvtbuALYqPUvE8=";
+    url = "https://mcfm.fnal.gov/downloads/MCFM-${finalAttrs.version}.tar.gz";
+    hash = "sha256-3Dg4KoILb0XhgGkzItDh/1opCtYrrIvtbuALYqPUvE8=";
   };
 
   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"
@@ -40,4 +50,4 @@ stdenv.mkDerivation rec {
     maintainers = with lib.maintainers; [ veprbl ];
     platforms = lib.platforms.x86_64;
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 79d485ffe518..aa204dffae59 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11869,14 +11869,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