From 1996af425ac8ddea1e8a591650e7d0caba2aa201 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Wed, 6 Feb 2019 21:43:47 -0500
Subject: [PATCH] Use buildPackages for native dependencies

Unfortunately, releaseTools.nixBuild does not separate native and
non-native build inputs. As an alternative, we can just use
buildPackages to get the native version of some packages like:

- pkgconfig
- git
- curl
- utillinux
---
 release-common.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/release-common.nix b/release-common.nix
index 4c5565985..f2aa57c2c 100644
--- a/release-common.nix
+++ b/release-common.nix
@@ -50,14 +50,16 @@ rec {
   buildDeps =
     [ curl
       bzip2 xz brotli editline
-      openssl pkgconfig sqlite boehmgc
+      openssl sqlite boehmgc
       boost
 
+      buildPackages.pkgconfig
+
       # Tests
-      git
-      mercurial
+      buildPackages.git
+      buildPackages.mercurial
     ]
-    ++ lib.optionals stdenv.isLinux [libseccomp utillinuxMinimal]
+    ++ lib.optionals stdenv.isLinux [libseccomp buildPackages.utillinuxMinimal]
     ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium
     ++ lib.optional (stdenv.isLinux || stdenv.isDarwin)
       ((aws-sdk-cpp.override {