1 files changed, 24 insertions, 12 deletions

diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix
index bf1f9d14b77..2b0b43478aa 100644
--- a/pkgs/development/ruby-modules/gem-config/default.nix
+++ b/pkgs/development/ruby-modules/gem-config/default.nix
@@ -39,7 +39,8 @@ let
 in
 
 {
-  atk = attrs: { buildInputs = [ gtk2 pcre pkgconfig ]; };
+  nativeBuildInputs = [ pkgconfig ];
+  atk = attrs: { buildInputs = [ gtk2 pcre ]; };
 
   bundler = attrs:
     let
@@ -57,7 +58,8 @@ in
     };
 
   cairo = attrs: {
-    buildInputs = [ gtk2 pcre pkgconfig xlibs.libpthreadstubs xlibs.libXdmcp];
+  nativeBuildInputs = [ pkgconfig ];
+    buildInputs = [ gtk2 pcre xlibs.libpthreadstubs xlibs.libXdmcp];
   };
 
   capybara-webkit = attrs: {
@@ -81,29 +83,35 @@ in
   };
 
   ffi = attrs: {
-    buildInputs = [ libffi pkgconfig ];
+  nativeBuildInputs = [ pkgconfig ];
+    buildInputs = [ libffi ];
   };
 
   gpgme = attrs: {
     buildInputs = [ gpgme ];
   };
 
-  gio2 = attrs: { buildInputs = [ gtk2 pcre pkgconfig ]; };
+  nativeBuildInputs = [ pkgconfig ];
+  gio2 = attrs: { buildInputs = [ gtk2 pcre ]; };
 
   gitlab-markup = attrs: { meta.priority = 1; };
 
-  glib2 = attrs: { buildInputs = [ gtk2 pcre pkgconfig ]; };
+  nativeBuildInputs = [ pkgconfig ];
+  glib2 = attrs: { buildInputs = [ gtk2 pcre ]; };
 
   gtk2 = attrs: {
-    buildInputs = [ gtk2 pcre pkgconfig xlibs.libpthreadstubs xlibs.libXdmcp];
+  nativeBuildInputs = [ pkgconfig ];
+    buildInputs = [ gtk2 pcre xlibs.libpthreadstubs xlibs.libXdmcp];
     # CFLAGS must be set for this gem to detect gdkkeysyms.h correctly
     CFLAGS = "-I${gtk2.dev}/include/gtk-2.0 -I/non-existent-path";
   };
 
-  gobject-introspection = attrs: { buildInputs = [ gtk2 pcre pkgconfig ]; };
+  nativeBuildInputs = [ pkgconfig ];
+  gobject-introspection = attrs: { buildInputs = [ gtk2 pcre ]; };
 
   grpc = attrs: {
-    buildInputs = [ openssl pkgconfig ];
+  nativeBuildInputs = [ pkgconfig ];
+    buildInputs = [ openssl ];
   };
 
   hitimes = attrs: {
@@ -166,7 +174,8 @@ in
   };
 
   pango = attrs: {
-    buildInputs = [ gtk2 xlibs.libXdmcp pcre pkgconfig xlibs.libpthreadstubs ];
+  nativeBuildInputs = [ pkgconfig ];
+    buildInputs = [ gtk2 xlibs.libXdmcp pcre xlibs.libpthreadstubs ];
   };
 
   patron = attrs: {
@@ -204,7 +213,8 @@ in
   };
 
   rmagick = attrs: {
-    buildInputs = [ imagemagick pkgconfig which ];
+  nativeBuildInputs = [ pkgconfig ];
+    buildInputs = [ imagemagick which ];
   };
 
   ruby-lxc = attrs: {
@@ -219,7 +229,8 @@ in
     ];
   };
   rugged = attrs: {
-    buildInputs = [ cmake pkgconfig openssl libssh2 zlib ];
+  nativeBuildInputs = [ pkgconfig ];
+    buildInputs = [ cmake openssl libssh2 zlib ];
   };
 
   scrypt = attrs:
@@ -296,7 +307,8 @@ in
   xapian-ruby = attrs: {
     # use the system xapian
     dontBuild = false;
-    buildInputs = [ xapian_1_2_22 pkgconfig zlib ];
+  nativeBuildInputs = [ pkgconfig ];
+    buildInputs = [ xapian_1_2_22 zlib ];
     postPatch = ''
       cp ${./xapian-Rakefile} Rakefile
     '';