Use nativeBuildInputs

release-common.nix

@@ -47,19 +47,21 @@ rec {
       autoreconfHook
     ];
 
+  nativeBuildDeps =
+    [ buildPackages.pkgconfig
+
+      # Tests
+      buildPackages.git
+      buildPackages.mercurial
+    ] ++ lib.optional stdenv.isLinux buildPackages.utillinuxMinimal;
+
   buildDeps =
     [ curl
       bzip2 xz brotli editline
       openssl sqlite boehmgc
       boost
-
-      buildPackages.pkgconfig
-
-      # Tests
-      buildPackages.git
-      buildPackages.mercurial
     ]
-    ++ lib.optionals stdenv.isLinux [libseccomp buildPackages.utillinuxMinimal]
+    ++ lib.optional stdenv.isLinux libseccomp
     ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium
     ++ lib.optional (stdenv.isLinux || stdenv.isDarwin)
       ((aws-sdk-cpp.override {

release.nix

@@ -24,6 +24,7 @@ let
         src = nix;
         inherit officialRelease;
 
+        nativeBuildInputs = nativeBuildDeps;
         buildInputs = tarballDeps ++ buildDeps;
 
         configureFlags = "--enable-gc";
@@ -67,6 +68,7 @@ let
         name = "nix";
         src = tarball;
 
+        nativeBuildInputs = nativeBuildDeps;
         buildInputs = buildDeps;
 
         preConfigure =
@@ -199,6 +201,7 @@ let
         name = "nix-build";
         src = tarball;
 
+        nativeBuildInputs = nativeBuildDeps;
         buildInputs = buildDeps;
 
         dontInstall = false;