diff --git a/packages/nextcloud-mcp-server/package.nix b/packages/nextcloud-mcp-server/package.nix
index 28c10bb..2d5905f 100644
--- a/packages/nextcloud-mcp-server/package.nix
+++ b/packages/nextcloud-mcp-server/package.nix
@@ -6,30 +6,23 @@
 }:
 
 let
-  mkPy = { pname, version, src, propagatedBuildInputs ? [ ], meta ? { }, ... }@args:
-    python3Packages.buildPythonPackage ({
-      inherit pname version src;
-      pyproject = true;
-      build-system = [ python3Packages.hatchling ];
-      inherit propagatedBuildInputs;
-      doCheck = false;
-      inherit meta;
-    } // builtins.removeAttrs args [ "pname" "version" "src" "propagatedBuildInputs" "meta" "pyproject" "build-system" "doCheck" ]);
-
+  # Helper: buildPythonPackage for a wheel fetched from PyPI
+  # CRITICAL: pname MUST use underscores, not hyphens, for PyPI wheel filenames
   fetchWheel = { pname, version, hash, propagatedBuildInputs ? [ ], meta ? { } }:
     python3Packages.buildPythonPackage {
       inherit pname version;
       format = "wheel";
-      src = fetchurl {
-        url = "https://files.pythonhosted.org/packages/placeholder/${pname}-${version}-py3-none-any.whl";
-        inherit hash;
+      src = fetchPypi {
+        inherit pname version hash;
+        format = "wheel";
+        dist = "py3";
+        python = "py3";
       };
       inherit propagatedBuildInputs;
       doCheck = false;
       inherit meta;
     };
 
-  # ── 20 dependency packages ──
   pythonvcard4 = fetchWheel {
     pname = "pythonvcard4"; version = "0.2.0"; hash = lib.fakeHash;
     meta = with lib; { description = "vCard parsing"; homepage = "https://github.com/GNOME/python-vcard4"; license = licenses.gpl3Plus; };