diff --git a/pkgs/development/tools/language-servers/nixd/default.nix b/pkgs/development/tools/language-servers/nixd/default.nix
index e5f03d10205e..0813dcc24fe9 100644
--- a/pkgs/development/tools/language-servers/nixd/default.nix
+++ b/pkgs/development/tools/language-servers/nixd/default.nix
@@ -20,14 +20,15 @@
 }:
 
 let
+  nix = nixVersions.nix_2_28;
   common = rec {
-    version = "2.6.3";
+    version = "2.6.4";
 
     src = fetchFromGitHub {
       owner = "nix-community";
       repo = "nixd";
       tag = version;
-      hash = "sha256-Gd7VFyQ/ayw0NI72sdZ1wFuXaxlIPWyE31Kl53d3zB4=";
+      hash = "sha256-K7S626SPzlNCmRhntSKhGP1iyHJXBZEeHliX4iEwbKk=";
     };
 
     nativeBuildInputs = [
@@ -101,13 +102,11 @@ in
       ];
 
       buildInputs = [
-        nixVersions.nix_2_24
+        nix
         gtest
         boost
       ];
 
-      env.CXXFLAGS = "-include ${nixVersions.nix_2_24.dev}/include/nix/config.h";
-
       passthru.tests.pkg-config = testers.hasPkgConfigModules {
         package = nixt;
         moduleNames = [ "nixt" ];
@@ -127,7 +126,7 @@ in
       sourceRoot = "${common.src.name}/nixd";
 
       buildInputs = [
-        nixVersions.nix_2_24
+        nix
         nixf
         nixt
         llvmPackages.llvm
@@ -137,8 +136,6 @@ in
 
       nativeBuildInputs = common.nativeBuildInputs ++ [ cmake ];
 
-      env.CXXFLAGS = "-include ${nixVersions.nix_2_24.dev}/include/nix/config.h";
-
       # See https://github.com/nix-community/nixd/issues/519
       doCheck = false;