misc pkgs: Basic sed to get fix `pkgconfig` and `autoreconfHook` `buildInputs`

Only acts on one-line dependency lists.
author: John Ericson <John.Ericson@Obsidian.Systems> 2017-09-05 17:26:13 -0400
committer: John Ericson <John.Ericson@Obsidian.Systems> 2017-09-21 15:49:53 -0400
commit: 531e4b80c97002a542beb8fe356177ebd66cdd8e (patch)
tree: 4fb5b90d44ecb5a7b15fdc7d6e10bda66f4542f0 /pkgs/desktops
parent: fd9c7eb2e8c1755b606cb0d7dab2ba0bb93e36ed (diff)
download: nixlib-531e4b80c97002a542beb8fe356177ebd66cdd8e.tar
nixlib-531e4b80c97002a542beb8fe356177ebd66cdd8e.tar.gz
nixlib-531e4b80c97002a542beb8fe356177ebd66cdd8e.tar.bz2
nixlib-531e4b80c97002a542beb8fe356177ebd66cdd8e.tar.lz
nixlib-531e4b80c97002a542beb8fe356177ebd66cdd8e.tar.xz
nixlib-531e4b80c97002a542beb8fe356177ebd66cdd8e.tar.zst
nixlib-531e4b80c97002a542beb8fe356177ebd66cdd8e.zip
129 files changed, 258 insertions, 129 deletions
diff --git a/pkgs/desktops/gnome-2/bindings/libglademm/default.nix b/pkgs/desktops/gnome-2/bindings/libglademm/default.nix
index c140eb944c6c..8cf18b7018da 100644
--- a/pkgs/desktops/gnome-2/bindings/libglademm/default.nix
+++ b/pkgs/desktops/gnome-2/bindings/libglademm/default.nix
@@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "1hrbg9l5qb7w0xvr7013qamkckyj0fqc426c851l69zpmhakqm1q";
   };
   
-  buildInputs = [ pkgconfig intltool ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ intltool ];
   
   propagatedBuildInputs = [ gtkmm libglade ];
 }
diff --git a/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix
index ff4abf26ac83..c07dc9730e6d 100644
--- a/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix
@@ -13,7 +13,8 @@ stdenv.mkDerivation {
     sha256 = "0rkyg6naidql0nv74608mlsr2lzjgnndnxnxv3s0hp4f6mbqnmkw";
   };
 
-  buildInputs = [ pkgconfig dbus_glib libxml2Python libxslt libxklavier popt which python shared_mime_info desktop_file_utils
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ dbus_glib libxml2Python libxslt libxklavier popt which python shared_mime_info desktop_file_utils
                   gtk gnome_doc_utils intltool GConf libglade libgnomekbd libunique libtool bzip2 
                   libgnomeui librsvg gnome_menus gnome_desktop gnome_panel metacity gnome_settings_daemon
                   libSM
diff --git a/pkgs/desktops/gnome-2/desktop/gnome-desktop/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-desktop/default.nix
index 9f41a589220b..63df026836fa 100644
--- a/pkgs/desktops/gnome-2/desktop/gnome-desktop/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/gnome-desktop/default.nix
@@ -10,6 +10,7 @@ stdenv.mkDerivation {
   };
 
   configureFlags = "--disable-scrollkeeper";
-  buildInputs = [ pkgconfig python libxml2Python libxslt which libX11 gtk
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ python libxml2Python libxslt which libX11 gtk
                   intltool GConf gnome_doc_utils ];
 }
diff --git a/pkgs/desktops/gnome-2/desktop/gnome-menus/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-menus/default.nix
index e114f72a21b8..0dcb409e0aae 100644
--- a/pkgs/desktops/gnome-2/desktop/gnome-menus/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/gnome-menus/default.nix
@@ -8,5 +8,6 @@ stdenv.mkDerivation {
     sha256 = "1ajckii51spmkgfc0168c56x0syz5vwb2fp8b81c5s6n0r85dk3d";
   };
 
-  buildInputs = [ pkgconfig python glib intltool ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ python glib intltool ];
 }
diff --git a/pkgs/desktops/gnome-2/desktop/libgnomekbd/default.nix b/pkgs/desktops/gnome-2/desktop/libgnomekbd/default.nix
index ab01796197c2..f0882e39a857 100644
--- a/pkgs/desktops/gnome-2/desktop/libgnomekbd/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/libgnomekbd/default.nix
@@ -8,5 +8,6 @@ stdenv.mkDerivation {
     sha256 = "0mnjhdryx94c106fghzz01dyc1vlp16wn6sajvpxffnqqx62rmfx";
   };
 
-  buildInputs = [ pkgconfig dbus_glib libxklavier glib gtk intltool GConf libglade ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ dbus_glib libxklavier glib gtk intltool GConf libglade ];
 }
diff --git a/pkgs/desktops/gnome-2/desktop/libgweather/default.nix b/pkgs/desktops/gnome-2/desktop/libgweather/default.nix
index 7a1b4d1f5318..4b1daa3af90b 100644
--- a/pkgs/desktops/gnome-2/desktop/libgweather/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/libgweather/default.nix
@@ -9,5 +9,6 @@ stdenv.mkDerivation rec {
     sha256 = "0k16lpdyy8as8wgc5dqpy5b8i9i4mrl77qx8db23fgs2c533fddq";
   };
   configureFlags = "--with-zoneinfo-dir=${stdenv.glibc}/share/zoneinfo";
-  buildInputs = [ pkgconfig libxml2 gtk intltool GConf libsoup libtasn1 nettle gmp ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ libxml2 gtk intltool GConf libsoup libtasn1 nettle gmp ];
 }
diff --git a/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix b/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix
index 75db62554360..22604f214d48 100644
--- a/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix
@@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
     sha256 = "1slb7gajn30vdaq0hf5rikwdly1npmg1cf83hpjs82xd98knl13d";
   };
 
-   buildInputs = [ pkgconfig glib dbus_glib gmime libnotify libgnome_keyring openssl cyrus_sasl gnonlin sylpheed gob2 gettext intltool gnome2.GConf gnome2.libgnomeui dbus_glib gmime libnotify gnome2.gnome_keyring gnome2.scrollkeeper libxml2 gnome2.gnome_icon_theme hicolor_icon_theme tango-icon-theme ];
+  nativeBuildInputs = [ pkgconfig ];
+   buildInputs = [ glib dbus_glib gmime libnotify libgnome_keyring openssl cyrus_sasl gnonlin sylpheed gob2 gettext intltool gnome2.GConf gnome2.libgnomeui dbus_glib gmime libnotify gnome2.gnome_keyring gnome2.scrollkeeper libxml2 gnome2.gnome_icon_theme hicolor_icon_theme tango-icon-theme ];
 
   prePatch = ''
     sed -i  -e '/jb_rule_set_install_message/d' -e '/jb_rule_add_install_command/d' jbsrc/jb.c
diff --git a/pkgs/desktops/gnome-2/desktop/rarian/default.nix b/pkgs/desktops/gnome-2/desktop/rarian/default.nix
index 77a2b710f447..d2bcaa7c5e10 100644
--- a/pkgs/desktops/gnome-2/desktop/rarian/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/rarian/default.nix
@@ -6,6 +6,7 @@ stdenv.mkDerivation rec {
     url = "mirror://gnome/sources/rarian/0.8/${name}.tar.bz2";
     sha256 = "aafe886d46e467eb3414e91fa9e42955bd4b618c3e19c42c773026b205a84577";
   };
-  buildInputs = [pkgconfig perl perlXMLParser libxml2 libxslt];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ perl perlXMLParser libxml2 libxslt];
   configureFlags = "--with-xml-catalog=${docbook_xml_dtd_42}/xml/dtd/docbook/docbook.cat";
 }
diff --git a/pkgs/desktops/gnome-2/desktop/scrollkeeper/default.nix b/pkgs/desktops/gnome-2/desktop/scrollkeeper/default.nix
index 8cd8635c85c5..62a224eb504a 100644
--- a/pkgs/desktops/gnome-2/desktop/scrollkeeper/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/scrollkeeper/default.nix
@@ -13,6 +13,7 @@ stdenv.mkDerivation {
     cp ${automake}/share/automake*/config.{sub,guess} .
   ";
 
-  buildInputs = [pkgconfig perl perlXMLParser libxml2 libxslt gettext];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ perl perlXMLParser libxml2 libxslt gettext];
   configureFlags = "--with-xml-catalog=${docbook_xml_dtd_42}/xml/dtd/docbook/catalog.xml";
 }
diff --git a/pkgs/desktops/gnome-2/desktop/vte/default.nix b/pkgs/desktops/gnome-2/desktop/vte/default.nix
index dc8181414ce1..e5d2489436ee 100644
--- a/pkgs/desktops/gnome-2/desktop/vte/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/vte/default.nix
@@ -18,7 +18,8 @@ in stdenv.mkDerivation rec {
     ./vte-0.28.2-limit-arguments.patch
   ];
 
-  buildInputs = [ intltool pkgconfig glib gtk ncurses ] ++
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ intltool glib gtk ncurses ] ++
                 stdenv.lib.optionals pythonSupport [python pygtk];
 
   configureFlags = ''
diff --git a/pkgs/desktops/gnome-2/platform/at-spi/default.nix b/pkgs/desktops/gnome-2/platform/at-spi/default.nix
index 6be2a440879f..b0b669148ff3 100644
--- a/pkgs/desktops/gnome-2/platform/at-spi/default.nix
+++ b/pkgs/desktops/gnome-2/platform/at-spi/default.nix
@@ -11,6 +11,7 @@ stdenv.mkDerivation {
 
   hardeningDisable = [ "format" ];
 
-  buildInputs = [ python pkgconfig popt atk gtk libX11 libICE libXtst libXi
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ python popt atk gtk libX11 libICE libXtst libXi
                   intltool libbonobo ORBit2 GConf dbus_glib ];
 }
diff --git a/pkgs/desktops/gnome-2/platform/gnome-vfs-monikers/default.nix b/pkgs/desktops/gnome-2/platform/gnome-vfs-monikers/default.nix
index 0f811471fb0c..029d751e7190 100644
--- a/pkgs/desktops/gnome-2/platform/gnome-vfs-monikers/default.nix
+++ b/pkgs/desktops/gnome-2/platform/gnome-vfs-monikers/default.nix
@@ -6,5 +6,6 @@ stdenv.mkDerivation {
     url = mirror://gnome/sources/gnome-vfs-monikers/2.15/gnome-vfs-monikers-2.15.3.tar.bz2;
     sha256 = "0gpgk5vwhgqfhrd8pf1314kh7sv3jfqll2xbdbrs5s5sxy3v7b15";
   };
-  buildInputs = [ pkgconfig glib intltool gnome_vfs libbonobo ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ glib intltool gnome_vfs libbonobo ];
 }
diff --git a/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix b/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix
index 4525246c20ed..49b8cc88f9de 100644
--- a/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix
+++ b/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix
@@ -11,5 +11,6 @@ stdenv.mkDerivation rec {
   };
 
   propagatedBuildInputs = [ gsettings_desktop_schemas gtk3 gnome_icon_theme GConf ];
-  buildInputs = [pkgconfig intltool enchant isocodes ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ intltool enchant isocodes ];
 }
diff --git a/pkgs/desktops/gnome-2/platform/gtkhtml/default.nix b/pkgs/desktops/gnome-2/platform/gtkhtml/default.nix
index 49161c1a7455..8927bd120f61 100644
--- a/pkgs/desktops/gnome-2/platform/gtkhtml/default.nix
+++ b/pkgs/desktops/gnome-2/platform/gtkhtml/default.nix
@@ -13,5 +13,6 @@ stdenv.mkDerivation rec {
   #http://www.mail-archive.com/debian-bugs-rc@lists.debian.org/msg250091.html
   patches = [ ./01_remove-disable-deprecated.patch ];
 
-  buildInputs = [pkgconfig gtk intltool GConf enchant isocodes gnome_icon_theme ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ gtk intltool GConf enchant isocodes gnome_icon_theme ];
 }
diff --git a/pkgs/desktops/gnome-2/platform/libglade/default.nix b/pkgs/desktops/gnome-2/platform/libglade/default.nix
index a20c419fe0fb..5003215529e4 100644
--- a/pkgs/desktops/gnome-2/platform/libglade/default.nix
+++ b/pkgs/desktops/gnome-2/platform/libglade/default.nix
@@ -10,7 +10,8 @@ stdenv.mkDerivation {
 
   outputs = [ "out" "dev" ];
 
-  buildInputs = [ pkgconfig gtk python gettext ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ gtk python gettext ];
 
   propagatedBuildInputs = [ libxml2 ];
 
diff --git a/pkgs/desktops/gnome-2/platform/libgnomecanvasmm/default.nix b/pkgs/desktops/gnome-2/platform/libgnomecanvasmm/default.nix
index 4d0f3061c450..9d22488c25da 100644
--- a/pkgs/desktops/gnome-2/platform/libgnomecanvasmm/default.nix
+++ b/pkgs/desktops/gnome-2/platform/libgnomecanvasmm/default.nix
@@ -8,5 +8,6 @@ stdenv.mkDerivation {
     sha256 = "996577f97f459a574919e15ba7fee6af8cda38a87a98289e9a4f54752d83e918";
   };
 
-  buildInputs = [ pkgconfig libgnomecanvas gtkmm ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ libgnomecanvas gtkmm ];
 }
diff --git a/pkgs/desktops/gnome-2/platform/libgnomecups/default.nix b/pkgs/desktops/gnome-2/platform/libgnomecups/default.nix
index 7eef5af0adcb..2365e166d5ee 100644
--- a/pkgs/desktops/gnome-2/platform/libgnomecups/default.nix
+++ b/pkgs/desktops/gnome-2/platform/libgnomecups/default.nix
@@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
 
   patches = [ ./glib.patch ./cups_1.6.patch ];
 
-  buildInputs = [ pkgconfig gtk gettext intltool libart_lgpl ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ gtk gettext intltool libart_lgpl ];
 
   propagatedBuildInputs = [ libxml2 ];
 }
diff --git a/pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix b/pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix
index 390059089fc0..6945ad1f04b9 100644
--- a/pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix
+++ b/pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
 
   patches = [ ./bug653388.patch ];
 
-  buildInputs = [ pkgconfig gtk gettext intltool libart_lgpl libgnomecups bison flex ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ gtk gettext intltool libart_lgpl libgnomecups bison flex ];
 
   propagatedBuildInputs = [ libxml2 ];
 
diff --git a/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix b/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix
index a19b20e86b5c..a8072aa37525 100644
--- a/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix
+++ b/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix
@@ -8,5 +8,6 @@ stdenv.mkDerivation {
     sha256 = "0spl8vinb5n6n1krnfnr61dwaxidg67h8j94z9p59k2xdsvfashm";
   };
 
-  buildInputs = [ pkgconfig gtk gettext intltool libgnomecanvas libgnomeprint gnomeicontheme];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ gtk gettext intltool libgnomecanvas libgnomeprint gnomeicontheme];
 }
diff --git a/pkgs/desktops/gnome-2/platform/libgtkhtml/default.nix b/pkgs/desktops/gnome-2/platform/libgtkhtml/default.nix
index be288b809d43..b9db3422723e 100644
--- a/pkgs/desktops/gnome-2/platform/libgtkhtml/default.nix
+++ b/pkgs/desktops/gnome-2/platform/libgtkhtml/default.nix
@@ -8,7 +8,8 @@ stdenv.mkDerivation {
     sha256 = "0msajafd42545dxzyr5zqka990cjrxw2yz09ajv4zs8m1w6pm9rw";
   };
 
-  buildInputs = [ pkgconfig gtk gettext ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ gtk gettext ];
   propagatedBuildInputs = [ libxml2 ];
 
   hardeningDisable = [ "format" ];
diff --git a/pkgs/desktops/gnome-3/3.24/apps/bijiben/default.nix b/pkgs/desktops/gnome-3/3.24/apps/bijiben/default.nix
index 00895f9a2bb2..9aae9215650f 100644
--- a/pkgs/desktops/gnome-3/3.24/apps/bijiben/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/apps/bijiben/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
 
   propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
 
-  buildInputs = [ pkgconfig glib intltool itstool libxml2
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ glib intltool itstool libxml2
                   clutter_gtk libuuid webkitgtk gnome3.tracker
                   gnome3.gnome_online_accounts zeitgeist desktop_file_utils
                   gnome3.gsettings_desktop_schemas makeWrapper
diff --git a/pkgs/desktops/gnome-3/3.24/apps/cheese/default.nix b/pkgs/desktops/gnome-3/3.24/apps/cheese/default.nix
index b5f70d84e520..a10864c347ef 100644
--- a/pkgs/desktops/gnome-3/3.24/apps/cheese/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/apps/cheese/default.nix
@@ -6,7 +6,8 @@
 stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
 
-  buildInputs = [ pkgconfig gtk3 glib intltool wrapGAppsHook gnome-video-effects itstool
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ gtk3 glib intltool wrapGAppsHook gnome-video-effects itstool
                   gdk_pixbuf adwaita-icon-theme librsvg udev gst_all_1.gstreamer libxml2
                   gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gnome_desktop
                   gst_all_1.gst-plugins-bad clutter_gtk clutter-gst
diff --git a/pkgs/desktops/gnome-3/3.24/apps/glade/default.nix b/pkgs/desktops/gnome-3/3.24/apps/glade/default.nix
index a0f8d9669556..da49c36cd069 100644
--- a/pkgs/desktops/gnome-3/3.24/apps/glade/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/apps/glade/default.nix
@@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
 
   propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
 
-  buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 python
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ gtk3 glib intltool itstool libxml2 python
                   gnome3.gsettings_desktop_schemas makeWrapper docbook_xsl
                   gdk_pixbuf gnome3.defaultIconTheme librsvg libxslt ];
 
diff --git a/pkgs/desktops/gnome-3/3.24/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome-3/3.24/apps/gnome-clocks/default.nix
index e39614e765d6..68cd2a42fa64 100644
--- a/pkgs/desktops/gnome-3/3.24/apps/gnome-clocks/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/apps/gnome-clocks/default.nix
@@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  buildInputs = [ pkgconfig gtk3 glib intltool itstool libcanberra_gtk3
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ gtk3 glib intltool itstool libcanberra_gtk3
                   gnome3.gsettings_desktop_schemas makeWrapper
                   gdk_pixbuf gnome3.defaultIconTheme librsvg
                   gnome3.gnome_desktop gnome3.geocode_glib geoclue2
diff --git a/pkgs/desktops/gnome-3/3.24/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/3.24/apps/gnome-documents/default.nix
index 4840d200cf99..d34334c4f64c 100644
--- a/pkgs/desktops/gnome-3/3.24/apps/gnome-documents/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/apps/gnome-documents/default.nix
@@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
 
   configureFlags = [ "--enable-getting-started" ];
 
-  buildInputs = [ pkgconfig gtk3 glib intltool itstool libxslt
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ gtk3 glib intltool itstool libxslt
                   docbook_xsl desktop_file_utils inkscape poppler_utils
                   gnome3.gsettings_desktop_schemas makeWrapper gmp
                   gdk_pixbuf gnome3.defaultIconTheme librsvg evince
diff --git a/pkgs/desktops/gnome-3/3.24/apps/gnome-maps/default.nix b/pkgs/desktops/gnome-3/3.24/apps/gnome-maps/default.nix
index 5af407ef15cd..bb8375d595ef 100644
--- a/pkgs/desktops/gnome-3/3.24/apps/gnome-maps/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/apps/gnome-maps/default.nix
@@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  buildInputs = [ pkgconfig intltool gobjectIntrospection wrapGAppsHook
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ intltool gobjectIntrospection wrapGAppsHook
                   gtk3 geoclue2 gnome3.gjs gnome3.libgee folks gfbgraph
                   gnome3.geocode_glib libchamplain file libsoup
                   gdk_pixbuf librsvg libgweather autoreconfHook
diff --git a/pkgs/desktops/gnome-3/3.24/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/3.24/apps/gnome-music/default.nix
index 4f11e7a28438..54e79872c679 100644
--- a/pkgs/desktops/gnome-3/3.24/apps/gnome-music/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/apps/gnome-music/default.nix
@@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
 
   propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
 
-  buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.libmediaart
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ gtk3 glib intltool itstool gnome3.libmediaart
                   gdk_pixbuf gnome3.defaultIconTheme librsvg python3Packages.python
                   gnome3.grilo gnome3.grilo-plugins gnome3.totem-pl-parser libxml2 libnotify
                   python3Packages.pycairo python3Packages.dbus-python python3Packages.requests
diff --git a/pkgs/desktops/gnome-3/3.24/apps/gnome-photos/default.nix b/pkgs/desktops/gnome-3/3.24/apps/gnome-photos/default.nix
index 6e8394950a6a..61ec2ac446ce 100644
--- a/pkgs/desktops/gnome-3/3.24/apps/gnome-photos/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/apps/gnome-photos/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
 
   NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
 
-  buildInputs = [ pkgconfig gtk3 glib intltool itstool gegl babl gnome3.libgdata
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ gtk3 glib intltool itstool gegl babl gnome3.libgdata
                   gnome3.gsettings_desktop_schemas makeWrapper gmp libmediaart
                   gdk_pixbuf gnome3.defaultIconTheme librsvg exempi
                   gnome3.gfbgraph gnome3.grilo-plugins gnome3.grilo
diff --git a/pkgs/desktops/gnome-3/3.24/apps/nautilus-sendto/default.nix b/pkgs/desktops/gnome-3/3.24/apps/nautilus-sendto/default.nix
index 093900dcb7ab..7d71d1b7adc9 100644
--- a/pkgs/desktops/gnome-3/3.24/apps/nautilus-sendto/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/apps/nautilus-sendto/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
     sha256 = "03fa46bff271acdbdedab6243b2a84e5ed3daa19c81b69d087b3e852c8fe5dab";
   };
 
-  buildInputs = [ glib pkgconfig gobjectIntrospection intltool makeWrapper ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ glib gobjectIntrospection intltool makeWrapper ];
 
   meta = with stdenv.lib; {
     description = "Integrates Evolution and Pidgin into the Nautilus file manager";
diff --git a/pkgs/desktops/gnome-3/3.24/apps/polari/default.nix b/pkgs/desktops/gnome-3/3.24/apps/polari/default.nix
index fc97d1b6d6e6..7c3da70edeb2 100644
--- a/pkgs/desktops/gnome-3/3.24/apps/polari/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/apps/polari/default.nix
@@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
 
   propagatedUserEnvPkgs = [ telepathy_idle telepathy_logger ];
 
-  buildInputs = [ pkgconfig gtk3 glib intltool itstool adwaita-icon-theme wrapGAppsHook gnome3.gsettings_desktop_schemas
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ gtk3 glib intltool itstool adwaita-icon-theme wrapGAppsHook gnome3.gsettings_desktop_schemas
                   telepathy_glib telepathy_logger gjs gspell gdk_pixbuf librsvg libxml2 libsecret libsoup ];
 
   enableParallelBuilding = true;
diff --git a/pkgs/desktops/gnome-3/3.24/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/3.24/apps/seahorse/default.nix
index 58d5a5b8cdc5..03dbdb1842a4 100644
--- a/pkgs/desktops/gnome-3/3.24/apps/seahorse/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/apps/seahorse/default.nix
@@ -13,7 +13,8 @@ stdenv.mkDerivation rec {
 
   NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
 
-  buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.gcr
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ gtk3 glib intltool itstool gnome3.gcr
                   gnome3.gsettings_desktop_schemas wrapGAppsHook gnupg
                   gdk_pixbuf gnome3.defaultIconTheme librsvg gpgme
                   libsecret avahi libsoup p11_kit vala_0_32
diff --git a/pkgs/desktops/gnome-3/3.24/apps/vinagre/default.nix b/pkgs/desktops/gnome-3/3.24/apps/vinagre/default.nix
index 8b8b6248642c..e719fbf9f219 100644
--- a/pkgs/desktops/gnome-3/3.24/apps/vinagre/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/apps/vinagre/default.nix
@@ -4,7 +4,8 @@
 stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
 
-  buildInputs = [ pkgconfig gtk3 vte libxml2 gtkvnc intltool libsecret
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ gtk3 vte libxml2 gtkvnc intltool libsecret
                   itstool makeWrapper gnome3.defaultIconTheme librsvg ];
 
   preFixup = ''
diff --git a/pkgs/desktops/gnome-3/3.24/core/baobab/default.nix b/pkgs/desktops/gnome-3/3.24/core/baobab/default.nix
index 15db270e80c5..f94cb3c57c46 100644
--- a/pkgs/desktops/gnome-3/3.24/core/baobab/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/baobab/default.nix
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
 
   NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
 
-  buildInputs = [ vala pkgconfig gtk3 glib libgtop intltool itstool libxml2
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ vala gtk3 glib libgtop intltool itstool libxml2
                   wrapGAppsHook file gdk_pixbuf gnome3.defaultIconTheme librsvg ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/3.24/core/dconf/default.nix b/pkgs/desktops/gnome-3/3.24/core/dconf/default.nix
index 9200c4180bd2..402c6c1c355e 100644
--- a/pkgs/desktops/gnome-3/3.24/core/dconf/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/dconf/default.nix
@@ -15,7 +15,8 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "lib" "dev" ];
 
-  buildInputs = [ vala_0_32 libxslt pkgconfig glib dbus_glib gnome3.gtk libxml2
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ vala_0_32 libxslt glib dbus_glib gnome3.gtk libxml2
                   intltool docbook_xsl docbook_xsl_ns makeWrapper ];
 
   postConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
diff --git a/pkgs/desktops/gnome-3/3.24/core/empathy/default.nix b/pkgs/desktops/gnome-3/3.24/core/empathy/default.nix
index 9a29d11f1aea..ea257ed69f0f 100644
--- a/pkgs/desktops/gnome-3/3.24/core/empathy/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/empathy/default.nix
@@ -25,7 +25,8 @@ stdenv.mkDerivation rec {
                             gnome_online_accounts shared_mime_info ];
   propagatedBuildInputs = [ folks telepathy_logger evolution_data_server
                             telepathy_mission_control ];
-  buildInputs = [ pkgconfig gtk3 glib webkitgtk intltool itstool
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ gtk3 glib webkitgtk intltool itstool
                   libxml2 libxslt icu file makeWrapper
                   telepathy_glib clutter_gtk clutter-gst cogl
                   gst_all_1.gstreamer gst_all_1.gst-plugins-base
diff --git a/pkgs/desktops/gnome-3/3.24/core/epiphany/default.nix b/pkgs/desktops/gnome-3/3.24/core/epiphany/default.nix
index ec8cf1188156..ed76d726a4cb 100644
--- a/pkgs/desktops/gnome-3/3.24/core/epiphany/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/epiphany/default.nix
@@ -14,7 +14,8 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig file wrapGAppsHook ];
 
-  buildInputs = [ gtk3 glib intltool libwnck3 libxml2 libxslt pkgconfig file
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ gtk3 glib intltool libwnck3 libxml2 libxslt file
                   webkitgtk libsoup libsecret gnome_desktop libnotify libtool
                   sqlite isocodes nss itstool p11_kit nspr icu gnome3.yelp_tools
                   gdk_pixbuf gnome3.defaultIconTheme librsvg which gnome_common
diff --git a/pkgs/desktops/gnome-3/3.24/core/gdm/default.nix b/pkgs/desktops/gnome-3/3.24/core/gdm/default.nix
index 59f0381f2e87..09e27e7c0c5f 100644
--- a/pkgs/desktops/gnome-3/3.24/core/gdm/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/gdm/default.nix
@@ -16,7 +16,8 @@ stdenv.mkDerivation rec {
                      "--with-plymouth=yes"
                      "--with-systemdsystemunitdir=$(out)/etc/systemd/system" ];
 
-  buildInputs = [ pkgconfig glib itstool libxml2 intltool autoreconfHook
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  buildInputs = [ glib itstool libxml2 intltool
                   accountsservice gnome3.dconf systemd
                   gobjectIntrospection libX11 gtk
                   libcanberra_gtk3 pam libtool plymouth librsvg ];
diff --git a/pkgs/desktops/gnome-3/3.24/core/gjs/default.nix b/pkgs/desktops/gnome-3/3.24/core/gjs/default.nix
index 10d9c46123dd..482d6ae64a40 100644
--- a/pkgs/desktops/gnome-3/3.24/core/gjs/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/gjs/default.nix
@@ -4,7 +4,8 @@
 stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
 
-  buildInputs = [ libxml2 gobjectIntrospection pkgconfig gtk3 glib pango readline dbus ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ libxml2 gobjectIntrospection gtk3 glib pango readline dbus ];
 
   propagatedBuildInputs = [ spidermonkey_38 ];
 
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-bluetooth/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-bluetooth/default.nix
index 7fae0b5c67f4..f237d745c1cc 100644
--- a/pkgs/desktops/gnome-3/3.24/core/gnome-bluetooth/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-bluetooth/default.nix
@@ -4,7 +4,8 @@
 stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
 
-  buildInputs = [ pkgconfig intltool glib gtk3 udev libxml2 gnome3.defaultIconTheme
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ intltool glib gtk3 udev libxml2 gnome3.defaultIconTheme
                   makeWrapper gnome3.gsettings_desktop_schemas itstool
                   libnotify libcanberra_gtk3 ];
 
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-contacts/default.nix
index 66cc2cb24c73..e69092a57123 100644
--- a/pkgs/desktops/gnome-3/3.24/core/gnome-contacts/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-contacts/default.nix
@@ -17,7 +17,8 @@ stdenv.mkDerivation rec {
    touch src/*.vala
   '';
 
-  buildInputs = [ pkgconfig gtk3 glib intltool itstool evolution_data_server
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ gtk3 glib intltool itstool evolution_data_server
                   gnome3.gsettings_desktop_schemas wrapGAppsHook file libnotify
                   folks gnome3.gnome_desktop telepathy_glib libsecret dbus_glib
                   libxml2 libsoup gnome3.gnome_online_accounts nspr nss
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-desktop/default.nix
index 7265f09731fd..d56018bf1e8b 100644
--- a/pkgs/desktops/gnome-3/3.24/core/gnome-desktop/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-desktop/default.nix
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  buildInputs = [ pkgconfig python libxml2Python libxslt which libX11
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ python libxml2Python libxslt which libX11
                   xkeyboard_config isocodes itstool wayland
                   gtk3 glib intltool gnome_doc_utils libxkbfile
                   gobjectIntrospection ];
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-dictionary/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-dictionary/default.nix
index c94c178558da..77c4805a197e 100644
--- a/pkgs/desktops/gnome-3/3.24/core/gnome-dictionary/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-dictionary/default.nix
@@ -13,7 +13,8 @@ stdenv.mkDerivation rec {
   propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
   propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ];
 
-  buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 file
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ gtk3 glib intltool itstool libxml2 file
                   gnome3.gsettings_desktop_schemas makeWrapper ];
 
   preFixup = ''
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-disk-utility/default.nix
index aef58567387b..f9380272f065 100644
--- a/pkgs/desktops/gnome-3/3.24/core/gnome-disk-utility/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-disk-utility/default.nix
@@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
 
   propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
 
-  buildInputs = [ bash pkgconfig gtk3 glib intltool itstool
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ bash gtk3 glib intltool itstool
                   libxslt libtool libsecret libpwquality cracklib
                   libnotify libdvdread libcanberra_gtk3 docbook_xsl
                   gdk_pixbuf gnome3.defaultIconTheme
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-font-viewer/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-font-viewer/default.nix
index 16d7151ea096..14aeb69e14cb 100644
--- a/pkgs/desktops/gnome-3/3.24/core/gnome-font-viewer/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-font-viewer/default.nix
@@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
 
   propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
 
-  buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.gnome_desktop
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ gtk3 glib intltool itstool gnome3.gnome_desktop
                   gdk_pixbuf gnome3.defaultIconTheme librsvg
                   gnome3.gsettings_desktop_schemas wrapGAppsHook ];
 
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-menus/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-menus/default.nix
index ee8c3a902d59..fdd23d134599 100644
--- a/pkgs/desktops/gnome-3/3.24/core/gnome-menus/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-menus/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
 
   makeFlags = "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/ INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0";
 
-  buildInputs = [ intltool pkgconfig glib gobjectIntrospection ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ intltool glib gobjectIntrospection ];
 
   meta = {
     homepage = http://www.gnome.org;
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-online-accounts/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-online-accounts/default.nix
index 29f6ae3e860e..9437a0d8a6b1 100644
--- a/pkgs/desktops/gnome-3/3.24/core/gnome-online-accounts/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-online-accounts/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  buildInputs = [ pkgconfig glib libxslt gtk webkitgtk json_glib rest gnome_common wrapGAppsHook
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ glib libxslt gtk webkitgtk json_glib rest gnome_common wrapGAppsHook
                   libsecret dbus_glib telepathy_glib glib_networking intltool icu libsoup
                   docbook_xsl_ns docbook_xsl gnome3.defaultIconTheme ];
 
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-online-miners/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-online-miners/default.nix
index 90fc3a8737ae..cb50494bb404 100644
--- a/pkgs/desktops/gnome-3/3.24/core/gnome-online-miners/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-online-miners/default.nix
@@ -4,7 +4,8 @@
 stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
 
-  buildInputs = [ pkgconfig glib gnome3.libgdata libxml2 libsoup gmp openssl
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ glib gnome3.libgdata libxml2 libsoup gmp openssl
                   gnome3.grilo gnome3.libzapojit gnome3.grilo-plugins
                   gnome3.gnome_online_accounts makeWrapper gnome3.libmediaart
                   gnome3.tracker gnome3.gfbgraph json_glib gnome3.rest ];
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-screenshot/default.nix
index 34f8cee625aa..1f933e1b3c57 100644
--- a/pkgs/desktops/gnome-3/3.24/core/gnome-screenshot/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-screenshot/default.nix
@@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
   propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
   propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ];
 
-  buildInputs = [ bash pkgconfig gtk3 glib intltool itstool libcanberra_gtk3
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ bash gtk3 glib intltool itstool libcanberra_gtk3
                   gnome3.gsettings_desktop_schemas wrapGAppsHook ];
 
   preFixup = ''
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-shell-extensions/default.nix
index 83305f440b14..fd90b8867d7b 100644
--- a/pkgs/desktops/gnome-3/3.24/core/gnome-shell-extensions/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-shell-extensions/default.nix
@@ -6,7 +6,8 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  buildInputs = [ pkgconfig gtk3 glib libgtop intltool itstool
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ gtk3 glib libgtop intltool itstool
                   makeWrapper file ];
 
   configureFlags = [ "--enable-extensions=all" ];
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-system-log/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-system-log/default.nix
index aa6f48ac420b..d66efca66d9c 100644
--- a/pkgs/desktops/gnome-3/3.24/core/gnome-system-log/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-system-log/default.nix
@@ -17,7 +17,8 @@ stdenv.mkDerivation rec {
   propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
   propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ];
 
-  buildInputs = [ bash pkgconfig gtk3 glib intltool itstool
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ bash gtk3 glib intltool itstool
                   gnome3.gsettings_desktop_schemas wrapGAppsHook libxml2 ];
 
   preFixup = ''
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-system-monitor/default.nix
index 3164e4dd74b1..c32d9d95d88f 100644
--- a/pkgs/desktops/gnome-3/3.24/core/gnome-system-monitor/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-system-monitor/default.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
 
   propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
 
-  buildInputs = [ bash pkgconfig gtk3 glib intltool itstool libxml2
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ bash gtk3 glib intltool itstool libxml2
                   gtkmm3 libgtop wrapGAppsHook
                   gdk_pixbuf gnome3.defaultIconTheme librsvg
                   gnome3.gsettings_desktop_schemas systemd ];
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-themes-standard/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-themes-standard/default.nix
index 5cc3385ad841..3db252d063f2 100644
--- a/pkgs/desktops/gnome-3/3.24/core/gnome-themes-standard/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-themes-standard/default.nix
@@ -4,7 +4,8 @@
 stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
 
-  buildInputs = [ intltool gtk3 librsvg pkgconfig pango atk gtk2 gdk_pixbuf
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ intltool gtk3 librsvg pango atk gtk2 gdk_pixbuf
                   gnome3.defaultIconTheme ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-user-docs/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-user-docs/default.nix
index 4f02673e036f..6ab72ab7826d 100644
--- a/pkgs/desktops/gnome-3/3.24/core/gnome-user-docs/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-user-docs/default.nix
@@ -3,7 +3,8 @@
 stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
 
-  buildInputs = [ pkgconfig gnome3.yelp itstool libxml2 intltool ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ gnome3.yelp itstool libxml2 intltool ];
 
   meta = with stdenv.lib; {
     homepage = "https://help.gnome.org/users/gnome-help/${gnome3.version}";
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-user-share/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-user-share/default.nix
index 587165e107b0..0b83f6eb2267 100644
--- a/pkgs/desktops/gnome-3/3.24/core/gnome-user-share/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-user-share/default.nix
@@ -21,7 +21,8 @@ stdenv.mkDerivation rec {
                      "--with-systemduserunitdir=$(out)/etc/systemd/user"
                      "--with-nautilusdir=$(out)/lib/nautilus/extensions-3.0" ];
 
-  buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 libtool
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ gtk3 glib intltool itstool libxml2 libtool
                   wrapGAppsHook file gdk_pixbuf gnome3.defaultIconTheme librsvg
                   nautilus libnotify libcanberra_gtk3 systemd ];
 
diff --git a/pkgs/desktops/gnome-3/3.24/core/grilo-plugins/default.nix b/pkgs/desktops/gnome-3/3.24/core/grilo-plugins/default.nix
index 4b8fc90adad8..b6d9ccef6667 100644
--- a/pkgs/desktops/gnome-3/3.24/core/grilo-plugins/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/grilo-plugins/default.nix
@@ -14,7 +14,8 @@ stdenv.mkDerivation rec {
 
   installFlags = [ "GRL_PLUGINS_DIR=$(out)/lib/grilo-${major}" ];
 
-  buildInputs = [ pkgconfig gnome3.grilo libxml2 gupnp gssdp gnome3.libgdata
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ gnome3.grilo libxml2 gupnp gssdp gnome3.libgdata
                   lua5 liboauth gupnp_av sqlite gnome3.gnome_online_accounts
                   gnome3.totem-pl-parser gnome3.rest gmime json_glib
                   avahi gnome3.libmediaart tracker intltool itstool ];
diff --git a/pkgs/desktops/gnome-3/3.24/core/grilo/default.nix b/pkgs/desktops/gnome-3/3.24/core/grilo/default.nix
index b4a794812a5c..18a4da4efe2d 100644
--- a/pkgs/desktops/gnome-3/3.24/core/grilo/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/grilo/default.nix
@@ -22,7 +22,8 @@ stdenv.mkDerivation rec {
     done
   '';
 
-  buildInputs = [ pkgconfig file intltool glib libxml2 libsoup
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ file intltool glib libxml2 libsoup
                   gnome3.totem-pl-parser ];
 
   propagatedBuildInputs = [ python3Packages.pygobject3 gobjectIntrospection ];
diff --git a/pkgs/desktops/gnome-3/3.24/core/gsound/default.nix b/pkgs/desktops/gnome-3/3.24/core/gsound/default.nix
index 95785d9ed4d2..8e72b7fb233e 100644
--- a/pkgs/desktops/gnome-3/3.24/core/gsound/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/gsound/default.nix
@@ -10,7 +10,8 @@ in stdenv.mkDerivation rec {
     sha256 = "ea0dd94429c0645f2f98824274ef04543fe459dd83a5449a68910acc3ba67f29";
   };
 
-  buildInputs = [ pkgconfig glib libcanberra_gtk2 gobjectIntrospection libtool ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ glib libcanberra_gtk2 gobjectIntrospection libtool ];
 
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Projects/GSound;
diff --git a/pkgs/desktops/gnome-3/3.24/core/gtksourceview/default.nix b/pkgs/desktops/gnome-3/3.24/core/gtksourceview/default.nix
index 3dfbe6fbf0b5..a39464449485 100644
--- a/pkgs/desktops/gnome-3/3.24/core/gtksourceview/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/gtksourceview/default.nix
@@ -6,7 +6,8 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ gtk3 ];
 
-  buildInputs = [ pkgconfig atk cairo glib pango
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ atk cairo glib pango
                   libxml2Python perl intltool gettext ];
 
   preBuild = ''
diff --git a/pkgs/desktops/gnome-3/3.24/core/gtksourceviewmm/default.nix b/pkgs/desktops/gnome-3/3.24/core/gtksourceviewmm/default.nix
index 43e27cdb4814..7763867bcbff 100644
--- a/pkgs/desktops/gnome-3/3.24/core/gtksourceviewmm/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/gtksourceviewmm/default.nix
@@ -3,7 +3,8 @@
 stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
 
-  buildInputs = [ pkgconfig glibmm gtkmm gtksourceview ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ glibmm gtkmm gtksourceview ];
 
   meta = with stdenv.lib; {
     platforms = platforms.linux;
diff --git a/pkgs/desktops/gnome-3/3.24/core/gucharmap/default.nix b/pkgs/desktops/gnome-3/3.24/core/gucharmap/default.nix
index 05aff866606f..39c1181a52ab 100644
--- a/pkgs/desktops/gnome-3/3.24/core/gucharmap/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/gucharmap/default.nix
@@ -14,7 +14,8 @@ stdenv.mkDerivation rec {
 
   preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file";
 
-  buildInputs = [ pkgconfig gtk3 intltool itstool glib appdata-tools
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ gtk3 intltool itstool glib appdata-tools
                   gnome3.yelp_tools libxml2 file desktop_file_utils
                   gnome3.gsettings_desktop_schemas makeWrapper ];
 
diff --git a/pkgs/desktops/gnome-3/3.24/core/libgee/default.nix b/pkgs/desktops/gnome-3/3.24/core/libgee/default.nix
index d4697c99a938..4d59a3f20133 100644
--- a/pkgs/desktops/gnome-3/3.24/core/libgee/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/libgee/default.nix
@@ -15,7 +15,8 @@ stdenv.mkDerivation rec {
 
   patches = [ ./fix_introspection_paths.patch ];
 
-  buildInputs = [ autoconf vala_0_32 pkgconfig glib gobjectIntrospection ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ autoconf vala_0_32 glib gobjectIntrospection ];
 
   meta = with stdenv.lib; {
     description = "Utility library providing GObject-based interfaces and classes for commonly used data structures";
diff --git a/pkgs/desktops/gnome-3/3.24/core/libgepub/default.nix b/pkgs/desktops/gnome-3/3.24/core/libgepub/default.nix
index 47cb96de6c34..56159500228a 100644
--- a/pkgs/desktops/gnome-3/3.24/core/libgepub/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/libgepub/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  buildInputs = [ autoconf pkgconfig glib gobjectIntrospection webkitgtk libsoup
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ autoconf glib gobjectIntrospection webkitgtk libsoup
     libxml2 libarchive ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/3.24/core/libgnomekbd/default.nix b/pkgs/desktops/gnome-3/3.24/core/libgnomekbd/default.nix
index 2bcbefc8dbf9..74636708988b 100644
--- a/pkgs/desktops/gnome-3/3.24/core/libgnomekbd/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/libgnomekbd/default.nix
@@ -3,7 +3,8 @@
 stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
 
-  buildInputs = [ pkgconfig file intltool glib gtk3 libxklavier makeWrapper ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ file intltool glib gtk3 libxklavier makeWrapper ];
 
   preFixup = ''
     wrapProgram $out/bin/gkbd-keyboard-display \
diff --git a/pkgs/desktops/gnome-3/3.24/core/libgxps/default.nix b/pkgs/desktops/gnome-3/3.24/core/libgxps/default.nix
index b39e1f6fa56c..5c1ffb450396 100644
--- a/pkgs/desktops/gnome-3/3.24/core/libgxps/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/libgxps/default.nix
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
     sha256 = "1gi0b0x0354jyqc48vspk2hg2q1403cf2p9ibj847nzhkdrh9l9r";
   };
 
-  buildInputs = [ pkgconfig glib cairo freetype libjpeg libtiff acl openssl bzip2 attr libxml2 ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ glib cairo freetype libjpeg libtiff acl openssl bzip2 attr libxml2 ];
   propagatedBuildInputs = [ libarchive ];
 
   configureFlags = "--without-liblcms2";
diff --git a/pkgs/desktops/gnome-3/3.24/core/libpeas/default.nix b/pkgs/desktops/gnome-3/3.24/core/libpeas/default.nix
index 9f1f30965330..8fddd8f7d5a6 100644
--- a/pkgs/desktops/gnome-3/3.24/core/libpeas/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/libpeas/default.nix
@@ -7,7 +7,8 @@ stdenv.mkDerivation rec {
 
   configureFlags = [ "--enable-python3" ];
 
-  buildInputs =  [ intltool pkgconfig glib gtk3 gnome3.defaultIconTheme ncurses python3Packages.python python3Packages.pygobject3 gobjectIntrospection ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs =  [ intltool glib gtk3 gnome3.defaultIconTheme ncurses python3Packages.python python3Packages.pygobject3 gobjectIntrospection ];
 
   meta = with stdenv.lib; {
     description = "A GObject-based plugins engine";
diff --git a/pkgs/desktops/gnome-3/3.24/core/libzapojit/default.nix b/pkgs/desktops/gnome-3/3.24/core/libzapojit/default.nix
index 5a8117528b68..c5c75c166f73 100644
--- a/pkgs/desktops/gnome-3/3.24/core/libzapojit/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/libzapojit/default.nix
@@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "0zn3s7ryjc3k1abj4k55dr2na844l451nrg9s6cvnnhh569zj99x";
   };
 
-  buildInputs = [ pkgconfig glib intltool json_glib rest libsoup gtk gnome_online_accounts ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ glib intltool json_glib rest libsoup gtk gnome_online_accounts ];
 
   meta = with stdenv.lib; {
     platforms = platforms.linux;
diff --git a/pkgs/desktops/gnome-3/3.24/core/rest/default.nix b/pkgs/desktops/gnome-3/3.24/core/rest/default.nix
index d467cad93b4e..154e7221cc20 100644
--- a/pkgs/desktops/gnome-3/3.24/core/rest/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/rest/default.nix
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
     sha256 = "e7b89b200c1417073aef739e8a27ff2ab578056c27796ec74f5886a5e0dff647";
   };
 
-  buildInputs = [ pkgconfig glib libsoup gobjectIntrospection];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ glib libsoup gobjectIntrospection];
 
   configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt";
 
diff --git a/pkgs/desktops/gnome-3/3.24/core/sushi/default.nix b/pkgs/desktops/gnome-3/3.24/core/sushi/default.nix
index fb010756f290..638c0cbe7dcd 100644
--- a/pkgs/desktops/gnome-3/3.24/core/sushi/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/sushi/default.nix
@@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
 
   propagatedUserEnvPkgs = [ gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good ];
 
-  buildInputs = [ pkgconfig file intltool gobjectIntrospection glib gtk3
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ file intltool gobjectIntrospection glib gtk3
                   clutter_gtk clutter-gst gnome3.gjs gtksourceview gdk_pixbuf
                   librsvg gnome3.defaultIconTheme libmusicbrainz5 webkitgtk
                   gnome3.evince icu makeWrapper harfbuzz ];
diff --git a/pkgs/desktops/gnome-3/3.24/core/totem-pl-parser/default.nix b/pkgs/desktops/gnome-3/3.24/core/totem-pl-parser/default.nix
index 63f36004bcd6..794f38013337 100644
--- a/pkgs/desktops/gnome-3/3.24/core/totem-pl-parser/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/totem-pl-parser/default.nix
@@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "38be09bddc46ddecd2b5ed7c82144ef52aafe879a5ec3d8b192b4b64ba995469";
   };
 
-  buildInputs = [ pkgconfig file intltool gmime libxml2 libsoup ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ file intltool gmime libxml2 libsoup ];
 
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Apps/Videos;
diff --git a/pkgs/desktops/gnome-3/3.24/core/totem/default.nix b/pkgs/desktops/gnome-3/3.24/core/totem/default.nix
index b3e9e5dd1fee..34ec9b58116f 100644
--- a/pkgs/desktops/gnome-3/3.24/core/totem/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/totem/default.nix
@@ -15,7 +15,8 @@ stdenv.mkDerivation rec {
 
   propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
 
-  buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 gnome3.grilo
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ gtk3 glib intltool itstool libxml2 gnome3.grilo
                   clutter_gtk clutter-gst gnome3.totem-pl-parser gnome3.grilo-plugins
                   gst_all_1.gstreamer gst_all_1.gst-plugins-base
                   gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly gst_all_1.gst-libav
diff --git a/pkgs/desktops/gnome-3/3.24/core/tracker/default.nix b/pkgs/desktops/gnome-3/3.24/core/tracker/default.nix
index a60c38015c08..0d3e8bd358d4 100644
--- a/pkgs/desktops/gnome-3/3.24/core/tracker/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/tracker/default.nix
@@ -18,7 +18,8 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  buildInputs = [ vala_0_32 pkgconfig gtk3 glib intltool itstool libxml2
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ vala_0_32 gtk3 glib intltool itstool libxml2
                   bzip2 gnome3.totem-pl-parser libxslt
                   gnome3.gsettings_desktop_schemas wrapGAppsHook
                   file gdk_pixbuf gnome3.defaultIconTheme librsvg sqlite
diff --git a/pkgs/desktops/gnome-3/3.24/core/vte/2.90.nix b/pkgs/desktops/gnome-3/3.24/core/vte/2.90.nix
index 4f56439311ec..7cd72ceee42c 100644
--- a/pkgs/desktops/gnome-3/3.24/core/vte/2.90.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/vte/2.90.nix
@@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
     sha256 = "54e5b07be3c0f7b158302f54ee79d4de1cb002f4259b6642b79b1e0e314a959c";
   };
 
-  buildInputs = [ gobjectIntrospection intltool pkgconfig gnome3.glib gnome3.gtk3 ncurses ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ gobjectIntrospection intltool gnome3.glib gnome3.gtk3 ncurses ];
 
   configureFlags = [ "--enable-introspection" ];
 
diff --git a/pkgs/desktops/gnome-3/3.24/core/vte/default.nix b/pkgs/desktops/gnome-3/3.24/core/vte/default.nix
index 7eabe6ad9d4d..b3962015d3cc 100644
--- a/pkgs/desktops/gnome-3/3.24/core/vte/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/vte/default.nix
@@ -6,7 +6,8 @@
 stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
 
-  buildInputs = [ gobjectIntrospection intltool pkgconfig gnome3.glib
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ gobjectIntrospection intltool gnome3.glib
                   gnome3.gtk3 ncurses vala_0_32 libxml2 gperf ];
 
   propagatedBuildInputs = [ gnutls pcre2 ];
diff --git a/pkgs/desktops/gnome-3/3.24/core/yelp-tools/default.nix b/pkgs/desktops/gnome-3/3.24/core/yelp-tools/default.nix
index 9111802eb6a8..eaceadcc85c4 100644
--- a/pkgs/desktops/gnome-3/3.24/core/yelp-tools/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/yelp-tools/default.nix
@@ -3,7 +3,8 @@
 stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
 
-  buildInputs = [ libxml2 libxslt itstool gnome3.yelp_xsl pkgconfig ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ libxml2 libxslt itstool gnome3.yelp_xsl ];
 
   doCheck = true;
 
diff --git a/pkgs/desktops/gnome-3/3.24/core/yelp-xsl/default.nix b/pkgs/desktops/gnome-3/3.24/core/yelp-xsl/default.nix
index 0a3976f35a15..353b9ccb55e3 100644
--- a/pkgs/desktops/gnome-3/3.24/core/yelp-xsl/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/yelp-xsl/default.nix
@@ -6,7 +6,8 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  buildInputs = [ pkgconfig intltool itstool libxml2 libxslt ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ intltool itstool libxml2 libxslt ];
 
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Apps/Yelp;
diff --git a/pkgs/desktops/gnome-3/3.24/core/yelp/default.nix b/pkgs/desktops/gnome-3/3.24/core/yelp/default.nix
index 4ee79bbc3dc5..6b458598c299 100644
--- a/pkgs/desktops/gnome-3/3.24/core/yelp/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/yelp/default.nix
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
 
   preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file";
 
-  buildInputs = [ pkgconfig gtk3 glib webkitgtk intltool itstool sqlite
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ gtk3 glib webkitgtk intltool itstool sqlite
                   libxml2 libxslt icu file makeWrapper gnome3.yelp_xsl
                   librsvg gdk_pixbuf gnome3.defaultIconTheme groff
                   gnome3.gsettings_desktop_schemas wrapGAppsHook
diff --git a/pkgs/desktops/gnome-3/3.24/desktop/rarian/default.nix b/pkgs/desktops/gnome-3/3.24/desktop/rarian/default.nix
index a1b38b21869a..c6927111ed48 100644
--- a/pkgs/desktops/gnome-3/3.24/desktop/rarian/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/desktop/rarian/default.nix
@@ -7,7 +7,8 @@ stdenv.mkDerivation rec {
     sha256 = "aafe886d46e467eb3414e91fa9e42955bd4b618c3e19c42c773026b205a84577";
   };
 
-  buildInputs = [pkgconfig perl perlXMLParser libxml2 libxslt];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ perl perlXMLParser libxml2 libxslt];
   configureFlags = "--with-xml-catalog=${docbook_xml_dtd_42}/xml/dtd/docbook/docbook.cat";
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/3.24/devtools/anjuta/default.nix b/pkgs/desktops/gnome-3/3.24/devtools/anjuta/default.nix
index 6a50834f105e..9ff98c2825e6 100644
--- a/pkgs/desktops/gnome-3/3.24/devtools/anjuta/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/devtools/anjuta/default.nix
@@ -6,7 +6,8 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  buildInputs = [ pkgconfig flex bison gtk3 libxml2 gnome3.gjs gnome3.gdl
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ flex bison gtk3 libxml2 gnome3.gjs gnome3.gdl
     gnome3.libgda gnome3.gtksourceview intltool itstool python2 makeWrapper
     gnome3.gsettings_desktop_schemas
   ];
diff --git a/pkgs/desktops/gnome-3/3.24/devtools/gdl/default.nix b/pkgs/desktops/gnome-3/3.24/devtools/gdl/default.nix
index 156d91b3eae7..f12bbb0ca41d 100644
--- a/pkgs/desktops/gnome-3/3.24/devtools/gdl/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/devtools/gdl/default.nix
@@ -3,7 +3,8 @@
 stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
 
-  buildInputs = [ pkgconfig libxml2 gtk3 intltool ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ libxml2 gtk3 intltool ];
 
   meta = with stdenv.lib; {
     description = "Gnome docking library";
diff --git a/pkgs/desktops/gnome-3/3.24/games/aisleriot/default.nix b/pkgs/desktops/gnome-3/3.24/games/aisleriot/default.nix
index 9e5d256741f6..40e1473b59e2 100644
--- a/pkgs/desktops/gnome-3/3.24/games/aisleriot/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/games/aisleriot/default.nix
@@ -7,7 +7,8 @@ stdenv.mkDerivation rec {
 
   configureFlags = [ "--with-card-theme-formats=svg" ];
 
-  buildInputs = [ pkgconfig intltool itstool gtk3 wrapGAppsHook gconf
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ intltool itstool gtk3 wrapGAppsHook gconf
                   librsvg libxml2 desktop_file_utils guile_2_0 libcanberra_gtk3 ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/3.24/games/gnome-sudoku/default.nix b/pkgs/desktops/gnome-3/3.24/games/gnome-sudoku/default.nix
index c8ba82c7246d..a0f83d48c3da 100644
--- a/pkgs/desktops/gnome-3/3.24/games/gnome-sudoku/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/games/gnome-sudoku/default.nix
@@ -4,7 +4,8 @@
 stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
 
-  buildInputs = [ pkgconfig intltool wrapGAppsHook gtk3 gnome3.libgee
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ intltool wrapGAppsHook gtk3 gnome3.libgee
                   json_glib qqwing itstool libxml2 ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/3.24/games/iagno/default.nix b/pkgs/desktops/gnome-3/3.24/games/iagno/default.nix
index 1b6f08d1fd65..3836548b3ab2 100644
--- a/pkgs/desktops/gnome-3/3.24/games/iagno/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/games/iagno/default.nix
@@ -4,7 +4,8 @@
 stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
 
-  buildInputs = [ pkgconfig gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg
                   dconf libxml2 libcanberra_gtk3 wrapGAppsHook itstool intltool ];
 
   enableParallelBuilding = true;
diff --git a/pkgs/desktops/gnome-3/3.24/games/lightsoff/default.nix b/pkgs/desktops/gnome-3/3.24/games/lightsoff/default.nix
index 8ec54b489721..7bd3ca95de94 100644
--- a/pkgs/desktops/gnome-3/3.24/games/lightsoff/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/games/lightsoff/default.nix
@@ -4,7 +4,8 @@
 stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
 
-  buildInputs = [ pkgconfig gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg dconf
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg dconf
                   libxml2 clutter clutter_gtk wrapGAppsHook itstool intltool ];
 
   enableParallelBuilding = true;
diff --git a/pkgs/desktops/gnome-3/3.24/games/quadrapassel/default.nix b/pkgs/desktops/gnome-3/3.24/games/quadrapassel/default.nix
index f319608764d6..514b2a035575 100644
--- a/pkgs/desktops/gnome-3/3.24/games/quadrapassel/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/games/quadrapassel/default.nix
@@ -5,7 +5,8 @@
 stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
 
-  buildInputs = [ pkgconfig gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg
                   libcanberra_gtk3 itstool intltool clutter
                   libxml2 clutter_gtk wrapGAppsHook ];
 
diff --git a/pkgs/desktops/gnome-3/3.24/games/swell-foop/default.nix b/pkgs/desktops/gnome-3/3.24/games/swell-foop/default.nix
index a4cad01488d5..c6416960b7aa 100644
--- a/pkgs/desktops/gnome-3/3.24/games/swell-foop/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/games/swell-foop/default.nix
@@ -4,7 +4,8 @@
 stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
 
-  buildInputs = [ pkgconfig gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg
                   dconf wrapGAppsHook itstool intltool clutter clutter_gtk libxml2 ];
 
   enableParallelBuilding = true;
diff --git a/pkgs/desktops/gnome-3/3.24/games/tali/default.nix b/pkgs/desktops/gnome-3/3.24/games/tali/default.nix
index c2b1f5857124..6f6beee89615 100644
--- a/pkgs/desktops/gnome-3/3.24/games/tali/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/games/tali/default.nix
@@ -4,7 +4,8 @@
 stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
 
-  buildInputs = [ pkgconfig gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg
                   libxml2 itstool intltool wrapGAppsHook ];
 
   enableParallelBuilding = true;
diff --git a/pkgs/desktops/gnome-3/3.24/misc/california/default.nix b/pkgs/desktops/gnome-3/3.24/misc/california/default.nix
index ca0450dc7f94..b33488e34fce 100644
--- a/pkgs/desktops/gnome-3/3.24/misc/california/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/misc/california/default.nix
@@ -14,7 +14,8 @@ stdenv.mkDerivation rec {
 
   propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
 
-  buildInputs = [ makeWrapper intltool pkgconfig vala_0_32 glib gtk3 gnome3.libgee
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ makeWrapper intltool vala_0_32 glib gtk3 gnome3.libgee
     libsoup libgdata gnome3.gnome_online_accounts gnome3.evolution_data_server
     sqlite itstool xdg_utils gnome3.gsettings_desktop_schemas ];
 
diff --git a/pkgs/desktops/gnome-3/3.24/misc/geary/default.nix b/pkgs/desktops/gnome-3/3.24/misc/geary/default.nix
index e0622b176218..498ced47a089 100644
--- a/pkgs/desktops/gnome-3/3.24/misc/geary/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/misc/geary/default.nix
@@ -17,7 +17,8 @@ stdenv.mkDerivation rec {
 
   propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
 
-  buildInputs = [ intltool pkgconfig gtk3 makeWrapper cmake desktop_file_utils gnome_doc_utils
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ intltool gtk3 makeWrapper cmake desktop_file_utils gnome_doc_utils
                   vala_0_32 webkitgtk libnotify libcanberra_gtk3 gnome3.libgee libsecret gmime sqlite
                   libpthreadstubs gnome3.gsettings_desktop_schemas gnome3.gcr
                   gdk_pixbuf librsvg gnome3.defaultIconTheme ];
diff --git a/pkgs/desktops/gnome-3/3.24/misc/gexiv2/default.nix b/pkgs/desktops/gnome-3/3.24/misc/gexiv2/default.nix
index 69d89bd58795..d0801714a0f9 100644
--- a/pkgs/desktops/gnome-3/3.24/misc/gexiv2/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/misc/gexiv2/default.nix
@@ -16,7 +16,8 @@ stdenv.mkDerivation rec {
     patchShebangs .
   '';
 
-  buildInputs = [ pkgconfig glib libtool m4 ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ glib libtool m4 ];
   propagatedBuildInputs = [ exiv2 ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/3.24/misc/gfbgraph/default.nix b/pkgs/desktops/gnome-3/3.24/misc/gfbgraph/default.nix
index 46fa9bc39e5a..364a52ee5cdf 100644
--- a/pkgs/desktops/gnome-3/3.24/misc/gfbgraph/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/misc/gfbgraph/default.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
     sha256 = "1dp0v8ia35fxs9yhnqpxj3ir5lh018jlbiwifjfn8ayy7h47j4fs";
   };
 
-  buildInputs = [ pkgconfig glib gnome3.gnome_online_accounts ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ glib gnome3.gnome_online_accounts ];
   propagatedBuildInputs = [ libsoup json_glib gnome3.rest ];
 
   enableParallelBuilding = true;
diff --git a/pkgs/desktops/gnome-3/3.24/misc/gnome-tweak-tool/default.nix b/pkgs/desktops/gnome-3/3.24/misc/gnome-tweak-tool/default.nix
index 1df3c1ffdb7c..ad415368368d 100644
--- a/pkgs/desktops/gnome-3/3.24/misc/gnome-tweak-tool/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/misc/gnome-tweak-tool/default.nix
@@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
 
   makeFlags = [ "DESTDIR=/" ];
 
-  buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ gtk3 glib intltool itstool libxml2
                   gnome3.gsettings_desktop_schemas file
                   gdk_pixbuf gnome3.defaultIconTheme librsvg
                   libnotify gnome3.gnome_shell python2Packages.pygobject3
diff --git a/pkgs/desktops/gnome-3/3.24/misc/gnome-video-effects/default.nix b/pkgs/desktops/gnome-3/3.24/misc/gnome-video-effects/default.nix
index c0bd2fed3f2d..dfeefe0def86 100644
--- a/pkgs/desktops/gnome-3/3.24/misc/gnome-video-effects/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/misc/gnome-video-effects/default.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
     sha256 = "0jl4iny2dqpcgi3sgxzpgnbw0752i8ay3rscp2cgdjlp79ql5gil";
   };
 
-  buildInputs = [ pkgconfig intltool ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ intltool ];
 
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Projects/GnomeVideoEffects;
diff --git a/pkgs/desktops/gnome-3/3.24/misc/gspell/default.nix b/pkgs/desktops/gnome-3/3.24/misc/gspell/default.nix
index 44573d1a5bb1..71e3ff19dc3f 100644
--- a/pkgs/desktops/gnome-3/3.24/misc/gspell/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/misc/gspell/default.nix
@@ -5,7 +5,8 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ enchant ]; # required for pkgconfig
 
-  buildInputs = [ pkgconfig glib gtk3 isocodes vala ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ glib gtk3 isocodes vala ];
 
   meta = with stdenv.lib; {
     platforms = platforms.linux;
diff --git a/pkgs/desktops/gnome-3/3.24/misc/gtkhtml/default.nix b/pkgs/desktops/gnome-3/3.24/misc/gtkhtml/default.nix
index 89703b61932b..3f65ab36b0bb 100644
--- a/pkgs/desktops/gnome-3/3.24/misc/gtkhtml/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/misc/gtkhtml/default.nix
@@ -4,7 +4,8 @@
 stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
 
-  buildInputs = [ pkgconfig gtk3 intltool gnome3.adwaita-icon-theme
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ gtk3 intltool gnome3.adwaita-icon-theme
                   gnome3.gsettings_desktop_schemas ];
 
   propagatedBuildInputs = [ enchant isocodes ];
diff --git a/pkgs/desktops/gnome-3/3.24/misc/libgames-support/default.nix b/pkgs/desktops/gnome-3/3.24/misc/libgames-support/default.nix
index 98b71c9d9c9f..90ee658fd096 100644
--- a/pkgs/desktops/gnome-3/3.24/misc/libgames-support/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/misc/libgames-support/default.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
     sha256 = "1rsyf5hbjim7zpk1yar3gv65g1nmw6zbbc0smrmxsfk0f9n3j9m6";
   };
 
-  buildInputs = [ pkgconfig glib gtk3 libgee intltool ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ glib gtk3 libgee intltool ];
 
   meta = with stdenv.lib; {
     description = "Small library intended for internal use by GNOME Games, but it may be used by others";
diff --git a/pkgs/desktops/gnome-3/3.24/misc/libgda/default.nix b/pkgs/desktops/gnome-3/3.24/misc/libgda/default.nix
index 2e5b0a4af840..e9249978d851 100644
--- a/pkgs/desktops/gnome-3/3.24/misc/libgda/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/misc/libgda/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = [ "format" ];
 
-  buildInputs = [ pkgconfig intltool itstool libxml2 gtk3 openssl ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ intltool itstool libxml2 gtk3 openssl ];
 
   meta = with stdenv.lib; {
     description = "Database access library";
diff --git a/pkgs/desktops/gnome-3/3.24/misc/libgit2-glib/default.nix b/pkgs/desktops/gnome-3/3.24/misc/libgit2-glib/default.nix
index 6915ede4ad51..a71dbf5494da 100644
--- a/pkgs/desktops/gnome-3/3.24/misc/libgit2-glib/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/misc/libgit2-glib/default.nix
@@ -4,7 +4,8 @@
 stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
 
-  buildInputs = [ gnome3.gnome_common libtool pkgconfig vala_0_32 libssh2
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ gnome3.gnome_common libtool vala_0_32 libssh2
                   gtk_doc gobjectIntrospection libgit2 glib ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/3.24/misc/libmediaart/default.nix b/pkgs/desktops/gnome-3/3.24/misc/libmediaart/default.nix
index 9988541e0f5b..abdcdef99379 100644
--- a/pkgs/desktops/gnome-3/3.24/misc/libmediaart/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/misc/libmediaart/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
     sha256 = "0jg9gwxmhdxcbwb5svgkxkd3yl1d14wqzckcgg2swkn81i7al52v";
   };
 
-  buildInputs = [ pkgconfig glib gdk_pixbuf gobjectIntrospection ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ glib gdk_pixbuf gobjectIntrospection ];
 
   meta = with stdenv.lib; {
     description = "Library tasked with managing, extracting and handling media art caches";
diff --git a/pkgs/desktops/gnustep/back/default.nix b/pkgs/desktops/gnustep/back/default.nix
index 6678b11df023..02f58f81200e 100644
--- a/pkgs/desktops/gnustep/back/default.nix
+++ b/pkgs/desktops/gnustep/back/default.nix
@@ -16,7 +16,8 @@ gsmakeDerivation {
     url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-${version}.tar.gz";
     sha256 = "14gs1b32ahnihd7mwpjrws2b8hl11rl1wl24a7651d3z2l7f6xj2";
   };
-  buildInputs = [ cairo base gui freetype pkgconfig x11 libXmu ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ cairo base gui freetype x11 libXmu ];
   meta = {
     description = "A generic backend for GNUstep";
   };
diff --git a/pkgs/desktops/rox/rox-filer/default.nix b/pkgs/desktops/rox/rox-filer/default.nix
index 8624cac09ed7..54b112927690 100644
--- a/pkgs/desktops/rox/rox-filer/default.nix
+++ b/pkgs/desktops/rox/rox-filer/default.nix
@@ -11,7 +11,8 @@ in stdenv.mkDerivation {
     sha256 = "a929bd32ee18ef7a2ed48b971574574592c42e34ae09f36604bf663d7c101ba8";
   };
 
-  buildInputs = [ pkgconfig libxml2 gtk shared_mime_info hicolor_icon_theme libSM ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ libxml2 gtk shared_mime_info hicolor_icon_theme libSM ];
 
   patches = [
     ./rox-filer-2.11-in-source-build.patch
diff --git a/pkgs/desktops/xfce/applications/gigolo.nix b/pkgs/desktops/xfce/applications/gigolo.nix
index 9badeb5370e8..b29a50af3654 100644
--- a/pkgs/desktops/xfce/applications/gigolo.nix
+++ b/pkgs/desktops/xfce/applications/gigolo.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
   };
   name = "${p_name}-${ver_maj}.${ver_min}";
 
-  buildInputs = [ python gettext intltool gtk pkgconfig gvfs];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ python gettext intltool gtk gvfs];
 
   meta = {
     homepage = "http://goodies.xfce.org/projects/applications/${p_name}";
diff --git a/pkgs/desktops/xfce/applications/terminal.nix b/pkgs/desktops/xfce/applications/terminal.nix
index 1a6b585a22a0..ad1727da3b93 100644
--- a/pkgs/desktops/xfce/applications/terminal.nix
+++ b/pkgs/desktops/xfce/applications/terminal.nix
@@ -13,7 +13,8 @@ stdenv.mkDerivation rec {
   };
   name = "${p_name}-${ver_maj}.${ver_min}";
 
-  buildInputs = [ pkgconfig intltool exo gtk vte libxfce4util ncurses dbus_glib libxfce4ui ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ intltool exo gtk vte libxfce4util ncurses dbus_glib libxfce4ui ];
 
   meta = {
     homepage = http://www.xfce.org/projects/terminal;
diff --git a/pkgs/desktops/xfce/applications/xfce4-notifyd.nix b/pkgs/desktops/xfce/applications/xfce4-notifyd.nix
index a447812f9a78..a0856b6a6d7b 100644
--- a/pkgs/desktops/xfce/applications/xfce4-notifyd.nix
+++ b/pkgs/desktops/xfce/applications/xfce4-notifyd.nix
@@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
   };
   name = "${p_name}-${ver_maj}.${ver_min}";
 
-  buildInputs = [ pkgconfig intltool libnotify gtk libxfce4util libxfce4ui xfconf ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ intltool libnotify gtk libxfce4util libxfce4ui xfconf ];
 
   preFixup = ''
     rm $out/share/icons/hicolor/icon-theme.cache
diff --git a/pkgs/desktops/xfce/applications/xfce4-taskmanager.nix b/pkgs/desktops/xfce/applications/xfce4-taskmanager.nix
index 1063cfca090c..2de4f34fcf6f 100644
--- a/pkgs/desktops/xfce/applications/xfce4-taskmanager.nix
+++ b/pkgs/desktops/xfce/applications/xfce4-taskmanager.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
   };
   name = "${p_name}-${ver_maj}.${ver_min}";
 
-  buildInputs = [ intltool pkgconfig gtk libwnck ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ intltool gtk libwnck ];
 
   meta = {
     homepage = "http://goodies.xfce.org/projects/applications/${p_name}";
diff --git a/pkgs/desktops/xfce/art/xfce4-icon-theme.nix b/pkgs/desktops/xfce/art/xfce4-icon-theme.nix
index 1bd257991c97..3c7c425e3790 100644
--- a/pkgs/desktops/xfce/art/xfce4-icon-theme.nix
+++ b/pkgs/desktops/xfce/art/xfce4-icon-theme.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
   };
   name = "${p_name}-${ver_maj}.${ver_min}";
 
-  buildInputs = [ pkgconfig intltool gtk ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ intltool gtk ];
 
   meta = {
     homepage = http://www.xfce.org/;
diff --git a/pkgs/desktops/xfce/core/garcon.nix b/pkgs/desktops/xfce/core/garcon.nix
index 67c92dae5e88..46b9a3720090 100644
--- a/pkgs/desktops/xfce/core/garcon.nix
+++ b/pkgs/desktops/xfce/core/garcon.nix
@@ -14,7 +14,8 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" ];
 
-  buildInputs = [ pkgconfig intltool glib libxfce4util gtk libxfce4ui ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ intltool glib libxfce4util gtk libxfce4ui ];
 
   meta = with stdenv.lib; {
     homepage = http://www.xfce.org/;
diff --git a/pkgs/desktops/xfce/core/gtk-xfce-engine.nix b/pkgs/desktops/xfce/core/gtk-xfce-engine.nix
index 6e5ac7c55ea1..c4b2366e7870 100644
--- a/pkgs/desktops/xfce/core/gtk-xfce-engine.nix
+++ b/pkgs/desktops/xfce/core/gtk-xfce-engine.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
   };
   name = "${p_name}-${ver_maj}.${ver_min}";
 
-  buildInputs = [ pkgconfig intltool gtk ] ++ stdenv.lib.optional withGtk3 gtk3;
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ intltool gtk ] ++ stdenv.lib.optional withGtk3 gtk3;
   
   configureFlags = stdenv.lib.optional withGtk3 "--enable-gtk3";
 
diff --git a/pkgs/desktops/xfce/core/libxfce4util.nix b/pkgs/desktops/xfce/core/libxfce4util.nix
index 1c473b42d60b..5a411bfbb5be 100644
--- a/pkgs/desktops/xfce/core/libxfce4util.nix
+++ b/pkgs/desktops/xfce/core/libxfce4util.nix
@@ -14,7 +14,8 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" "devdoc" ];
 
-  buildInputs = [ pkgconfig glib intltool ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ glib intltool ];
 
   meta = {
     homepage = http://www.xfce.org/;
diff --git a/pkgs/desktops/xfce/core/xfce4-dev-tools.nix b/pkgs/desktops/xfce/core/xfce4-dev-tools.nix
index de55509aa40d..109c22f1e58c 100644
--- a/pkgs/desktops/xfce/core/xfce4-dev-tools.nix
+++ b/pkgs/desktops/xfce/core/xfce4-dev-tools.nix
@@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
     sha256 = "1jxmyp80pwbfgmqmwpjxs7z5dmm6pyf3qj62z20xy44izraadqz2";
   };
 
-  buildInputs = [ pkgconfig glib ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ glib ];
 
   # not needed to build it but to use it
   propagatedBuildInputs = [ autoconf automake libtool intltool ];
diff --git a/pkgs/desktops/xfce/core/xfconf.nix b/pkgs/desktops/xfce/core/xfconf.nix
index edbc11b86057..fbf03cc4a81d 100644
--- a/pkgs/desktops/xfce/core/xfconf.nix
+++ b/pkgs/desktops/xfce/core/xfconf.nix
@@ -15,7 +15,8 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" "devdoc" ];
 
   #TODO: no perl bingings yet (ExtUtils::Depends, ExtUtils::PkgConfig, Glib)
-  buildInputs = [ pkgconfig intltool glib libxfce4util ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ intltool glib libxfce4util ];
   propagatedBuildInputs = [ dbus_glib ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-battery-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-battery-plugin.nix
index 3438791cd781..0dcdcda69946 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-battery-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-battery-plugin.nix
@@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
   };
   name = "${p_name}-${ver_maj}.${ver_min}";
 
-  buildInputs = [ pkgconfig intltool libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ intltool libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ];
   preFixup = "rm $out/share/icons/hicolor/icon-theme.cache";
 
   meta = {
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin.nix
index 4e1733704287..6614d746b686 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin.nix
@@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
   };
   name = "${p_name}-${ver_maj}.${ver_min}";
 
-  buildInputs = [ pkgconfig intltool glib exo libXtst xproto libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ intltool glib exo libXtst xproto libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ];
   preFixup = "rm $out/share/icons/hicolor/icon-theme.cache";
 
   meta = {
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix
index 7aca910b8a82..fb8b1bae83d5 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix
@@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
   };
   name = "${p_name}-${ver_maj}.${ver_min}";
 
-  buildInputs = [ pkgconfig intltool glib exo libXtst xproto libxfce4util libxfce4ui xfce4panel xfconf gtk ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ intltool glib exo libXtst xproto libxfce4util libxfce4ui xfce4panel xfconf gtk ];
   preFixup = "rm $out/share/icons/hicolor/icon-theme.cache";
 
   meta = {
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin.nix
index 4ca19d734496..0905a9bb16a7 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin.nix
@@ -14,7 +14,8 @@ stdenv.mkDerivation rec {
     sha256 = "0b4yril07qgkmywjym1qp12r4g35bnh96879zbjps7cd3rkxld4p";
   };
 
-  buildInputs = [ pkgconfig intltool libxfce4util libxfcegui4 xfce4panel gtk ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ intltool libxfce4util libxfcegui4 xfce4panel gtk ];
 
   meta = {
     homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-dict-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-dict-plugin.nix
index 3be77ab77caa..b6d0fc12db3b 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-dict-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-dict-plugin.nix
@@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
   };
   name = "${p_name}-${ver_maj}.${ver_min}";
 
-  buildInputs = [ pkgconfig intltool libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ intltool libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ];
 
   meta = {
     homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin.nix
index fbc841db1fc6..438be7e84944 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin.nix
@@ -14,7 +14,8 @@ stdenv.mkDerivation rec {
 
   pythonPath = [ dockbarx ];
 
-  buildInputs = [ pkgconfig python2 vala gtk2 pythonPackages.wrapPython ]
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ python2 vala gtk2 pythonPackages.wrapPython ]
     ++ (with xfce; [ libxfce4util xfce4panel xfconf xfce4_dev_tools ])
     ++ pythonPath;
 
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin.nix
index d7c5f53d2ee7..a5cfc3659f67 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin.nix
@@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
   };
   name = "${p_name}-${ver_maj}.${ver_min}";
 
-  buildInputs = [ pkgconfig intltool libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ intltool libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ];
 
   meta = {
     homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix
index 6e0f98156f09..81bff06500bb 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix
@@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
   };
   name = "${p_name}-${ver_maj}.${ver_min}";
 
-  buildInputs = [ pkgconfig intltool libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ intltool libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ];
 
   meta = {
     homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin.nix
index 3e3861b7604c..4f4f882d67b1 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin.nix
@@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
   };
   name = "${p_name}-${ver_maj}.${ver_min}";
 
-  buildInputs = [ pkgconfig intltool libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ intltool libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ];
 
   meta = {
     homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin.nix
index 8b6552e4e6c6..c6252a48bff6 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin.nix
@@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
   };
   name = "${p_name}-${ver_maj}.${ver_min}";
 
-  buildInputs = [ pkgconfig intltool libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ intltool libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ];
 
   meta = {
     homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix
index dd80259db5fa..2b43eaca4c03 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix
@@ -13,7 +13,8 @@ stdenv.mkDerivation rec {
   };
   name = "${p_name}-${ver_maj}.${ver_min}";
 
-  buildInputs = [ pkgconfig intltool libxfce4util libxfce4ui xfce4panel
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ intltool libxfce4util libxfce4ui xfce4panel
     libxfcegui4 xfconf gtk exo gnutls libgcrypt ];
 
   meta = {
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix
index 6a2f5bd50849..6f16561d41d5 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix
@@ -13,7 +13,8 @@ stdenv.mkDerivation rec {
     sha256 = "1kvgq1pq7cykqdc3227dq0izad093ppfw3nfsrcp9i8mi6i5f7z7";
   };
 
-  buildInputs = [ pkgconfig intltool libxfce4util libxfce4ui xfce4panel
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ intltool libxfce4util libxfce4ui xfce4panel
     libxfcegui4 xfconf gtk exo ];
 
   meta = {
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin.nix
index 5822ff173c97..e81289f26f66 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin.nix
@@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
     sha256 = "1sl4qmjywfvv53ch7hyfysjfd91zl38y7gdw2y3k69vkzd3h18ad";
   };
 
-  buildInputs = [ pkgconfig python2 vala gtk2 libwnck libxfce4util xfce4panel ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ python2 vala gtk2 libwnck libxfce4util xfce4panel ];
 
   postPatch = ''
     substituteInPlace src/preferences.vala --replace 'Environment.get_system_data_dirs()' "{ \"$out/share\" }"
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin.nix
index 710ca70b0212..9650cafedec7 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin.nix
@@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
   };
   name = "${p_name}-${ver_maj}.${ver_min}";
 
-  buildInputs = [ pkgconfig intltool libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ intltool libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ];
   preFixup = "rm $out/share/icons/hicolor/icon-theme.cache";
 
   meta = {
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix
index eba05af69c05..c8c9c7735a9f 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix
@@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
   };
   name = "${p_name}-${ver_maj}.${ver_min}";
 
-  buildInputs = [ pkgconfig intltool libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk libunique ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ intltool libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk libunique ];
 
   meta = {
     homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin.nix
index 200e3ccb071b..34677db81d12 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin.nix
@@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
   };
   name = "${p_name}-${ver_maj}.${ver_min}";
 
-  buildInputs = [ pkgconfig intltool libxfce4util libxfce4ui xfce4panel gtk ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ intltool libxfce4util libxfce4ui xfce4panel gtk ];
 
   meta = {
     homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin.nix
index 334d6f4943fd..3c0d1a488f88 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin.nix
@@ -13,7 +13,8 @@ stdenv.mkDerivation rec {
   };
   name = "${p_name}-${ver_maj}.${ver_min}";
 
-  buildInputs = [ pkgconfig intltool glib exo pcre libxfce4util libxfce4ui xfce4panel xfconf gtk ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ intltool glib exo pcre libxfce4util libxfce4ui xfce4panel xfconf gtk ];
 
   hardeningDisable = [ "format" ];
 
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin.nix
index 37ad643930ab..32b2e6514620 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin.nix
@@ -13,7 +13,8 @@ stdenv.mkDerivation rec {
   };
   name = "${p_name}-${version}";
 
-  buildInputs = [ pkgconfig intltool python3 imagemagick libwnck gtk2
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ intltool python3 imagemagick libwnck gtk2
     exo libxfce4ui libxfce4util xfce4panel xfconf xfce4_dev_tools ];
 
   preConfigure = ''
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin.nix
index 42c54bf46b36..453c09cfc70c 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin.nix
@@ -15,7 +15,8 @@ stdenv.mkDerivation rec {
     sha256 = "10g65j5ia389ahhn3b9hr52ghpp0817fk0m60rfrv4wrzqrjxzk1";
   };
 
-  buildInputs = [ pkgconfig intltool libxfce4util libxfce4ui xfce4panel garcon
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ intltool libxfce4util libxfce4ui xfce4panel garcon
     gtk libxklavier librsvg libwnck  ];
 
   meta = {
author	John Ericson <John.Ericson@Obsidian.Systems>	2017-09-05 17:26:13 -0400
committer	John Ericson <John.Ericson@Obsidian.Systems>	2017-09-21 15:49:53 -0400
commit	531e4b80c97002a542beb8fe356177ebd66cdd8e (patch)
tree	4fb5b90d44ecb5a7b15fdc7d6e10bda66f4542f0 /pkgs/desktops
parent	fd9c7eb2e8c1755b606cb0d7dab2ba0bb93e36ed (diff)
download	nixlib-531e4b80c97002a542beb8fe356177ebd66cdd8e.tar nixlib-531e4b80c97002a542beb8fe356177ebd66cdd8e.tar.gz nixlib-531e4b80c97002a542beb8fe356177ebd66cdd8e.tar.bz2 nixlib-531e4b80c97002a542beb8fe356177ebd66cdd8e.tar.lz nixlib-531e4b80c97002a542beb8fe356177ebd66cdd8e.tar.xz nixlib-531e4b80c97002a542beb8fe356177ebd66cdd8e.tar.zst nixlib-531e4b80c97002a542beb8fe356177ebd66cdd8e.zip