From e9072ded9749ab00cc397980e8a26f83d341efc0 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Wed, 6 Feb 2019 22:43:28 -0500
Subject: [PATCH] Use nativeBuildInputs

---
 release-common.nix | 16 +++++++++-------
 release.nix        |  3 +++
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/release-common.nix b/release-common.nix
index f2aa57c2c..707d36f95 100644
--- a/release-common.nix
+++ b/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 {
diff --git a/release.nix b/release.nix
index 0ec742906..9843efa29 100644
--- a/release.nix
+++ b/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;