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

Only acts on one-line dependency lists.

9 files changed, 18 insertions, 9 deletions

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 ff4abf26ac8..c07dc9730e6 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 9f41a589220..63df026836f 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 e114f72a21b..0dcb409e0aa 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 ab01796197c..f0882e39a85 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 7a1b4d1f531..4b1daa3af90 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 75db6255436..22604f214d4 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 77a2b710f44..d2bcaa7c5e1 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 8cd8635c85c..62a224eb504 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 dc8181414ce..e5d2489436e 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 = ''