1 files changed, 37 insertions, 22 deletions
diff --git a/pkgs/tools/package-management/nix/modular/packaging/everything.nix b/pkgs/tools/package-management/nix/modular/packaging/everything.nix
index 1835eefb643b..f8605b923689 100644
--- a/pkgs/tools/package-management/nix/modular/packaging/everything.nix
+++ b/pkgs/tools/package-management/nix/modular/packaging/everything.nix
@@ -6,6 +6,8 @@
 
   maintainers,
 
+  version,
+
   nix-util,
   nix-util-c,
   nix-util-tests,
@@ -15,6 +17,7 @@
   nix-store-tests,
 
   nix-fetchers,
+  nix-fetchers-c,
   nix-fetchers-tests,
 
   nix-expr,
@@ -63,14 +66,20 @@ let
         nix-cmd
         ;
     }
-    // lib.optionalAttrs
-      (!stdenv.hostPlatform.isStatic && stdenv.buildPlatform.canExecute stdenv.hostPlatform)
-      {
-        # Currently fails in static build
-        inherit
-          nix-perl-bindings
-          ;
-      };
+    // lib.optionalAttrs (lib.versionAtLeast version "2.29pre") {
+      inherit
+        nix-fetchers-c
+        ;
+    }
+    //
+      lib.optionalAttrs
+        (!stdenv.hostPlatform.isStatic && stdenv.buildPlatform.canExecute stdenv.hostPlatform)
+        {
+          # Currently fails in static build
+          inherit
+            nix-perl-bindings
+            ;
+        };
 
   devdoc = buildEnv {
     name = "nix-${nix-cli.version}-devdoc";
@@ -225,20 +234,26 @@ stdenv.mkDerivation (finalAttrs: {
       "out"
       "man"
     ];
-    pkgConfigModules = [
-      "nix-cmd"
-      "nix-expr"
-      "nix-expr-c"
-      "nix-fetchers"
-      "nix-flake"
-      "nix-flake-c"
-      "nix-main"
-      "nix-main-c"
-      "nix-store"
-      "nix-store-c"
-      "nix-util"
-      "nix-util-c"
-    ];
+    pkgConfigModules =
+      [
+        "nix-cmd"
+        "nix-expr"
+        "nix-expr-c"
+        "nix-fetchers"
+      ]
+      ++ lib.optionals (lib.versionAtLeast version "2.29pre") [
+        "nix-fetchers-c"
+      ]
+      ++ [
+        "nix-flake"
+        "nix-flake-c"
+        "nix-main"
+        "nix-main-c"
+        "nix-store"
+        "nix-store-c"
+        "nix-util"
+        "nix-util-c"
+      ];
   };
 
 })