diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index 0e5bfb30aebd..1c74bab9a0ba 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -17,6 +17,7 @@
 , # Misc dependencies
   arrow-cpp
 , Cocoa
+, coc-clangd
 , coc-diagnostic
 , coc-pyright
 , code-minimap
@@ -345,6 +346,11 @@
     dependencies = with self; [ nvim-cmp zsh ];
   };
 
+  coc-clangd = buildVimPlugin {
+    inherit (coc-clangd) pname version meta;
+    src = "${coc-clangd}/lib/node_modules/coc-clangd";
+  };
+
   coc-diagnostic = buildVimPlugin {
     inherit (coc-diagnostic) pname version meta;
     src = "${coc-diagnostic}/lib/node_modules/coc-diagnostic";
@@ -2248,7 +2254,6 @@
   // (
   let
     nodePackageNames = [
-      "coc-clangd"
       "coc-cmake"
       "coc-css"
       "coc-docker"
diff --git a/pkgs/by-name/co/coc-clangd/package.nix b/pkgs/by-name/co/coc-clangd/package.nix
new file mode 100644
index 000000000000..032df2f18d7e
--- /dev/null
+++ b/pkgs/by-name/co/coc-clangd/package.nix
@@ -0,0 +1,27 @@
+{
+  lib,
+  buildNpmPackage,
+  fetchFromGitHub,
+}:
+
+buildNpmPackage {
+  pname = "coc-clangd";
+  version = "0.31.0";
+
+  src = fetchFromGitHub {
+    owner = "clangd";
+    repo = "coc-clangd";
+    # Upstream has no tagged versions
+    rev = "3a85a36f1ac08454deab1ed8d2553e0cae00cc1c";
+    hash = "sha256-uxK0nciLq4ZKFCoMJrO4dR0tuOBHYpgdZUc/KJ+JA/I=";
+  };
+
+  npmDepsHash = "sha256-93MEug2eEL/Hum+RFmXx0JYO6jUygF8QRmL5nTTFyrs=";
+
+  meta = {
+    description = "clangd extension for coc.nvim";
+    homepage = "https://github.com/clangd/coc-clangd";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ pyrox0 ];
+  };
+}
diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index 844bd5d168fa..e1c3fcb5eec3 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -69,6 +69,7 @@ mapAliases {
   castnow = pkgs.castnow; # added 2023-07-30
   inherit (pkgs) clean-css-cli; # added 2023-08-18
   inherit (pkgs) clubhouse-cli; # added 2023-08-18
+  inherit (pkgs) coc-clangd; # added 2024-06-29
   inherit (pkgs) coc-diagnostic; # added 2024-06-29
   coc-imselect = throw "coc-imselect was removed because it was broken"; # added 2023-08-21
   inherit (pkgs) coc-pyright; # added 2024-07-14
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index 97dc6d5793ca..bb694d4507a3 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -27,7 +27,6 @@
 , "cdk8s-cli"
 , "cdktf-cli"
 , "clipboard-cli"
-, "coc-clangd"
 , "coc-cmake"
 , "coc-css"
 , "coc-docker"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 293987817346..2a0268579223 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -62626,24 +62626,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  coc-clangd = nodeEnv.buildNodePackage {
-    name = "coc-clangd";
-    packageName = "coc-clangd";
-    version = "0.31.0";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/coc-clangd/-/coc-clangd-0.31.0.tgz";
-      sha512 = "4t6rVLxFrHp5L8/fSGMG1A4UEnAa41JwwczOBTnETOVQI9vYVL+PkXHCnYtx0e+yJZyCizpj/9IsbSPSDVmzag==";
-    };
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "clangd extension for coc.nvim";
-      homepage = "https://github.com/clangd/coc-clangd#readme";
-      license = "Apache-2.0 WITH LLVM-exception";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   coc-cmake = nodeEnv.buildNodePackage {
     name = "coc-cmake";
     packageName = "coc-cmake";