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

Only acts on one-line dependency lists.

27 files changed, 54 insertions, 27 deletions

diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix
index 1f8e559b41525..d005f6becadbe 100644
--- a/pkgs/misc/cups/default.nix
+++ b/pkgs/misc/cups/default.nix
@@ -20,7 +20,8 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "lib" "dev" "man" ];
 
-  buildInputs = [ pkgconfig zlib libjpeg libpng libtiff libusb gnutls libpaper ]
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ zlib libjpeg libpng libtiff libusb gnutls libpaper ]
     ++ optionals stdenv.isLinux [ avahi pam dbus systemd acl ]
     ++ optionals stdenv.isDarwin (with darwin; [
       configd apple_sdk.frameworks.ApplicationServices
diff --git a/pkgs/misc/drivers/foomatic-filters/default.nix b/pkgs/misc/drivers/foomatic-filters/default.nix
index bdba1eb7b817b..799b14dec1d0c 100644
--- a/pkgs/misc/drivers/foomatic-filters/default.nix
+++ b/pkgs/misc/drivers/foomatic-filters/default.nix
@@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "1qrkgbm5jay2r7sh9qbyf0aiyrsl1mdc844hxf7fhw95a0zfbqm2";
   };
 
-  buildInputs = [ pkgconfig perl cups dbus enscript ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ perl cups dbus enscript ];
 
   preConfigure =
     ''
diff --git a/pkgs/misc/drivers/xboxdrv/default.nix b/pkgs/misc/drivers/xboxdrv/default.nix
index 4e0b609fdb0c5..ffb2052ca0c18 100644
--- a/pkgs/misc/drivers/xboxdrv/default.nix
+++ b/pkgs/misc/drivers/xboxdrv/default.nix
@@ -15,7 +15,8 @@ in stdenv.mkDerivation {
     substituteInPlace Makefile --replace /usr/local "$out"
   '';
 
-  buildInputs = [ scons libX11 pkgconfig libusb1 boost glib dbus_glib];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ scons libX11 libusb1 boost glib dbus_glib];
 
   meta = with stdenv.lib; {
     homepage = http://pingus.seul.org/~grumbel/xboxdrv/;
diff --git a/pkgs/misc/drivers/xwiimote/default.nix b/pkgs/misc/drivers/xwiimote/default.nix
index 9cf70db471cc3..4fff6f6b8c177 100644
--- a/pkgs/misc/drivers/xwiimote/default.nix
+++ b/pkgs/misc/drivers/xwiimote/default.nix
@@ -7,7 +7,8 @@ stdenv.mkDerivation rec {
     sha256 = "1g9cbhblll47l300zr999xr51x2g98y49l222f77fhswd12kjzhd";
   };
 
-  buildInputs = [ udev ncurses pkgconfig bluez ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ udev ncurses bluez ];
 
   configureFlags = "--with-doxygen=no";
 
diff --git a/pkgs/misc/emulators/dolphin-emu/default.nix b/pkgs/misc/emulators/dolphin-emu/default.nix
index f606e352a7b01..8025cf766f07d 100644
--- a/pkgs/misc/emulators/dolphin-emu/default.nix
+++ b/pkgs/misc/emulators/dolphin-emu/default.nix
@@ -29,7 +29,8 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  buildInputs = [ pkgconfig cmake bluez ffmpeg libao mesa gtk2 glib
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ cmake bluez ffmpeg libao mesa gtk2 glib
                   gettext libpthreadstubs libXrandr libXext readline openal
                   libevdev libXdmcp portaudio libusb libpulseaudio
                   libevdev libXdmcp portaudio libusb libpulseaudio
diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix
index ca36d16072d79..41dbfd1999c40 100644
--- a/pkgs/misc/emulators/dolphin-emu/master.nix
+++ b/pkgs/misc/emulators/dolphin-emu/master.nix
@@ -21,7 +21,8 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  buildInputs = [ gcc pkgconfig cmake bluez ffmpeg libao mesa gtk2 glib pcre
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ gcc cmake bluez ffmpeg libao mesa gtk2 glib pcre
                   gettext libpthreadstubs libXrandr libXext libSM readline openal
                   libevdev libXdmcp portaudio libusb libpulseaudio ];
 
diff --git a/pkgs/misc/emulators/dosbox/unstable.nix b/pkgs/misc/emulators/dosbox/unstable.nix
index 95d03c425e35a..a17dd6a775eaf 100644
--- a/pkgs/misc/emulators/dosbox/unstable.nix
+++ b/pkgs/misc/emulators/dosbox/unstable.nix
@@ -14,7 +14,8 @@ in stdenv.mkDerivation rec {
 
   hardeningDisable = [ "format" ];
 
-  buildInputs = [ SDL SDL_net SDL_sound libpng mesa autoreconfHook ];
+  nativeBuildInputs = [ autoreconfHook ];
+  buildInputs = [ SDL SDL_net SDL_sound libpng mesa ];
 
   desktopItem = makeDesktopItem {
     name = "dosbox";
diff --git a/pkgs/misc/emulators/emulationstation/default.nix b/pkgs/misc/emulators/emulationstation/default.nix
index 9f33305ae143d..b700b22807c4d 100644
--- a/pkgs/misc/emulators/emulationstation/default.nix
+++ b/pkgs/misc/emulators/emulationstation/default.nix
@@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
     sha256 = "0cm0sq2wri2l9cvab1l0g02za59q7klj0h3p028vr96n6njj4w9v";
   };
 
-  buildInputs = [ pkgconfig cmake alsaLib boost curl eigen freeimage freetype libarchive mesa SDL2 ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ cmake alsaLib boost curl eigen freeimage freetype libarchive mesa SDL2 ];
 
   buildPhase = "cmake . && make";
   installPhase = ''
diff --git a/pkgs/misc/emulators/fs-uae/default.nix b/pkgs/misc/emulators/fs-uae/default.nix
index 172b2a2eb3e29..8b2409b74c33d 100644
--- a/pkgs/misc/emulators/fs-uae/default.nix
+++ b/pkgs/misc/emulators/fs-uae/default.nix
@@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
     sha256 = "14k2p324sdr662f49299mv0bw5jmpj1i2iqn0xs5pgf80x6l3mg2";
   };
 
-  buildInputs = [ pkgconfig gettext gtk2 SDL2 zlib glib openal mesa lua freetype libmpeg2 zip ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ gettext gtk2 SDL2 zlib glib openal mesa lua freetype libmpeg2 zip ];
 
   meta = {
     description = "An accurate, customizable Amiga Emulator";
diff --git a/pkgs/misc/emulators/gens-gs/default.nix b/pkgs/misc/emulators/gens-gs/default.nix
index 34507a252526c..bfe43403bc6c4 100644
--- a/pkgs/misc/emulators/gens-gs/default.nix
+++ b/pkgs/misc/emulators/gens-gs/default.nix
@@ -8,7 +8,8 @@ stdenv.mkDerivation {
     sha256 = "1ha5s6d3y7s9aq9f4zmn9p88109c3mrj36z2w68jhiw5xrxws833";
   };
 
-  buildInputs = [ pkgconfig gtk2 SDL nasm zlib libpng mesa ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ gtk2 SDL nasm zlib libpng mesa ];
 
   # Work around build failures on recent GTK+.
   # See http://ubuntuforums.org/showthread.php?p=10535837
diff --git a/pkgs/misc/emulators/mednaffe/default.nix b/pkgs/misc/emulators/mednaffe/default.nix
index 21e75a72d61c4..2006b74bdc69e 100644
--- a/pkgs/misc/emulators/mednaffe/default.nix
+++ b/pkgs/misc/emulators/mednaffe/default.nix
@@ -16,7 +16,8 @@ stdenv.mkDerivation rec {
     substituteInPlace src/mednaffe.c --replace "binpath = NULL" "binpath = g_strdup( \"${mednafen}/bin/mednafen\" )"
   '';
 
-  buildInputs = [ pkgconfig gtk2 mednafen ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ gtk2 mednafen ];
 
   meta = with stdenv.lib; {
     description = "A GTK based frontend for mednafen";
diff --git a/pkgs/misc/emulators/mupen64plus/default.nix b/pkgs/misc/emulators/mupen64plus/default.nix
index ea35ee8ac54bc..7de9b576ef377 100644
--- a/pkgs/misc/emulators/mupen64plus/default.nix
+++ b/pkgs/misc/emulators/mupen64plus/default.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
     sha256 = "0rmsvfn4zfvbhz6gf1xkb7hnwflv6sbklwjz2xk4dlpj4vcbjxcw";
   };
 
-  buildInputs = [ boost dash freetype libpng pkgconfig SDL which zlib ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ boost dash freetype libpng SDL which zlib ];
 
   buildPhase = ''
     dash m64p_build.sh PREFIX="$out" COREDIR="$out/lib/" PLUGINDIR="$out/lib/mupen64plus" SHAREDIR="$out/share/mupen64plus"
diff --git a/pkgs/misc/emulators/retroarch/default.nix b/pkgs/misc/emulators/retroarch/default.nix
index 171453b89d5b0..5e5ce9edca4ba 100644
--- a/pkgs/misc/emulators/retroarch/default.nix
+++ b/pkgs/misc/emulators/retroarch/default.nix
@@ -32,7 +32,8 @@ stdenv.mkDerivation rec {
     rev = "v${version}";
   };
 
-  buildInputs = [ pkgconfig ffmpeg mesa freetype libxml2 coreutils python34 which SDL ]
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ ffmpeg mesa freetype libxml2 coreutils python34 which SDL ]
                 ++ optional enableNvidiaCgToolkit nvidia_cg_toolkit
                 ++ optionals stdenv.isLinux [ udev alsaLib libX11 libXext libXxf86vm libXdmcp libv4l libpulseaudio ];
 
diff --git a/pkgs/misc/emulators/snes9x-gtk/default.nix b/pkgs/misc/emulators/snes9x-gtk/default.nix
index c6f4df1e5c06a..a45bb0b2ba1e4 100644
--- a/pkgs/misc/emulators/snes9x-gtk/default.nix
+++ b/pkgs/misc/emulators/snes9x-gtk/default.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
     sha256 = "9f7c5d2d0fa3fe753611cf94e8879b73b8bb3c0eab97cdbcb6ab7376efa78dc3";
   };
 
-  buildInputs = [ nasm SDL zlib libpng ncurses mesa intltool gtk2 pkgconfig libxml2 xlibsWrapper libpulseaudio];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ nasm SDL zlib libpng ncurses mesa intltool gtk2 libxml2 xlibsWrapper libpulseaudio];
 
   sourceRoot = "snes9x-${version}-src/gtk";
 
diff --git a/pkgs/misc/emulators/stella/default.nix b/pkgs/misc/emulators/stella/default.nix
index be872250d032e..41ba5a3b2e612 100644
--- a/pkgs/misc/emulators/stella/default.nix
+++ b/pkgs/misc/emulators/stella/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
     sha256 = "126jph21b70jlxapzmll8pq36i53lb304hbsiap25160vdqid4n1";
   };
 
-  buildInputs = [ pkgconfig SDL2 ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ SDL2 ];
 
   meta = {
     description = "An open-source Atari 2600 VCS emulator";
diff --git a/pkgs/misc/emulators/uae/default.nix b/pkgs/misc/emulators/uae/default.nix
index ca1881bdd5faa..318993d08b664 100644
--- a/pkgs/misc/emulators/uae/default.nix
+++ b/pkgs/misc/emulators/uae/default.nix
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
 
   configureFlags = [ "--with-sdl" "--with-sdl-sound" "--with-sdl-gfx" "--with-alsa" ];
 
-  buildInputs = [ pkgconfig gtk2 alsaLib SDL ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ gtk2 alsaLib SDL ];
 
   hardeningDisable = [ "format" ];
 
diff --git a/pkgs/misc/my-env/default.nix b/pkgs/misc/my-env/default.nix
index aec79f1c5cf52..2d210ca009866 100644
--- a/pkgs/misc/my-env/default.nix
+++ b/pkgs/misc/my-env/default.nix
@@ -6,7 +6,8 @@
     packageOverrides = pkgs : with pkgs; {
       sdlEnv = pkgs.myEnvFun {
           name = "sdl";
-          buildInputs = [ stdenv SDL SDL_image SDL_ttf SDL_gfx cmake SDL_net  pkgconfig];
+  nativeBuildInputs = [ pkgconfig ];
+          buildInputs = [ stdenv SDL SDL_image SDL_ttf SDL_gfx cmake SDL_net];
       };
     };
   }
diff --git a/pkgs/misc/sailsd/default.nix b/pkgs/misc/sailsd/default.nix
index 36593794ed7cb..25441a30d86b2 100644
--- a/pkgs/misc/sailsd/default.nix
+++ b/pkgs/misc/sailsd/default.nix
@@ -18,7 +18,8 @@ stdenv.mkDerivation rec {
     sha256 = "147cr4aw1kw4gv3bhn0cska855kmyah8m70vdw1q2lwz56lbf4mb";
   };
 
-  buildInputs = [ pkgconfig jansson libsailing ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ jansson libsailing ];
 
   INSTALL_PATH = "$(out)";
 
diff --git a/pkgs/misc/screensavers/light-locker/default.nix b/pkgs/misc/screensavers/light-locker/default.nix
index b13e9c7866c93..a0dac519a0b8b 100644
--- a/pkgs/misc/screensavers/light-locker/default.nix
+++ b/pkgs/misc/screensavers/light-locker/default.nix
@@ -28,7 +28,8 @@ stdenv.mkDerivation rec {
   # Patch so that systemd is "found" when configuring.
   patches = [ ./systemd.patch ];
 
-  buildInputs = [ which xfce.xfce4_dev_tools glib systemd pkgconfig
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ which xfce.xfce4_dev_tools glib systemd
                   libX11 libXScrnSaver libXxf86misc gtk3 dbus_glib wrapGAppsHook ];
 
   preConfigure = ''
diff --git a/pkgs/misc/screensavers/rss-glx/default.nix b/pkgs/misc/screensavers/rss-glx/default.nix
index 25994ba35622c..7b280d770b382 100644
--- a/pkgs/misc/screensavers/rss-glx/default.nix
+++ b/pkgs/misc/screensavers/rss-glx/default.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
     sha256 = "1aikafjqrfmv23jnrrm5d56dg6injh4l67zjdxzdapv9chw7g3cg";
   };
 
-  buildInputs = [ pkgconfig mesa xlibsWrapper imagemagick libtiff bzip2 ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ mesa xlibsWrapper imagemagick libtiff bzip2 ];
 
   NIX_CFLAGS_COMPILE = "-I${imagemagick.dev}/include/ImageMagick";
   NIX_LDFLAGS= "-rpath ${libXext}/lib";
diff --git a/pkgs/misc/screensavers/xss-lock/default.nix b/pkgs/misc/screensavers/xss-lock/default.nix
index 7aada47114557..500f7a9c5a3f2 100644
--- a/pkgs/misc/screensavers/xss-lock/default.nix
+++ b/pkgs/misc/screensavers/xss-lock/default.nix
@@ -10,7 +10,8 @@ stdenv.mkDerivation {
     sha256 = "10hx7k7ga8g08akwz8qrsvj8iqr5nd4siiva6sjx789jvf0sak7r";
   };
 
-  buildInputs = [ cmake pkgconfig docutils glib libpthreadstubs libXau
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ cmake docutils glib libpthreadstubs libXau
                   libXdmcp xcbutil ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/misc/screensavers/xssproxy/default.nix b/pkgs/misc/screensavers/xssproxy/default.nix
index e5b6bf0d167c5..a278e6dc949f6 100644
--- a/pkgs/misc/screensavers/xssproxy/default.nix
+++ b/pkgs/misc/screensavers/xssproxy/default.nix
@@ -12,7 +12,8 @@ stdenv.mkDerivation {
     sha256 = "0c83wmipnsdnbihc5niyczs7jrkss2s8n6iwwjdia7hkjzbd0hl7";
   };
 
-  buildInputs = [ glib pkgconfig xorg.libX11 xorg.libXScrnSaver dbus ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ glib xorg.libX11 xorg.libXScrnSaver dbus ];
 
   makeFlags = [
     "bindir=$(out)/bin"
diff --git a/pkgs/misc/screensavers/xtrlock-pam/default.nix b/pkgs/misc/screensavers/xtrlock-pam/default.nix
index 887c179c59d55..1aa1f347ab455 100644
--- a/pkgs/misc/screensavers/xtrlock-pam/default.nix
+++ b/pkgs/misc/screensavers/xtrlock-pam/default.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation {
     sha256 = "1z2wlhi5d05b18pvwz146kp0lkcc6z2mnilk01mk19hzbziyqmsc";
   };
 
-  buildInputs = [ python pkgconfig xlibsWrapper pam ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ python xlibsWrapper pam ];
 
   configurePhase = ''
     substituteInPlace .config/options.py --replace /usr/include/security/pam_appl.h ${pam}/include/security/pam_appl.h
diff --git a/pkgs/misc/seafile-shared/default.nix b/pkgs/misc/seafile-shared/default.nix
index 6ce337855d99a..d302fbe6d4b69 100644
--- a/pkgs/misc/seafile-shared/default.nix
+++ b/pkgs/misc/seafile-shared/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec
     sha256 = "03zvxk25311xgn383k54qvvpr8xbnl1vxd99fg4ca9yg5rmir1q6";
   };
 
-  buildInputs = [ which automake autoconf pkgconfig libtool vala_0_23 python intltool fuse ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ which automake autoconf libtool vala_0_23 python intltool fuse ];
   propagatedBuildInputs = [ ccnet curl ];
 
   preConfigure = ''
diff --git a/pkgs/misc/solfege/default.nix b/pkgs/misc/solfege/default.nix
index 114e18dc93f88..4fef8d0804344 100644
--- a/pkgs/misc/solfege/default.nix
+++ b/pkgs/misc/solfege/default.nix
@@ -14,7 +14,8 @@ in stdenv.mkDerivation rec {
     sha256 = "1r4g93ka7i8jh5glii5nza0zq0wy4sw0gfzpvkcrhj9yr1h0jsp4";
   };
 
-  buildInputs = [ pkgconfig python pygtk gettext texinfo
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ python pygtk gettext texinfo
     ghostscript librsvg gdk_pixbuf txt2man makeWrapper
   ];
 
diff --git a/pkgs/misc/themes/gtk2/gtk-engine-murrine/default.nix b/pkgs/misc/themes/gtk2/gtk-engine-murrine/default.nix
index 81609eff55abb..4ec5b5da0a4aa 100644
--- a/pkgs/misc/themes/gtk2/gtk-engine-murrine/default.nix
+++ b/pkgs/misc/themes/gtk2/gtk-engine-murrine/default.nix
@@ -8,7 +8,8 @@ stdenv.mkDerivation {
     sha256 = "129cs5bqw23i76h3nmc29c9mqkm9460iwc8vkl7hs4xr07h8mip9";
   };
 
-  buildInputs = [ pkgconfig intltool gtk2 ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ intltool gtk2 ];
 
   meta = {
     description = "A very flexible theme engine";
diff --git a/pkgs/misc/themes/gtk2/gtk-engines/default.nix b/pkgs/misc/themes/gtk2/gtk-engines/default.nix
index e64b13f930559..966190a5e7686 100644
--- a/pkgs/misc/themes/gtk2/gtk-engines/default.nix
+++ b/pkgs/misc/themes/gtk2/gtk-engines/default.nix
@@ -8,7 +8,8 @@ stdenv.mkDerivation {
     sha256 = "1db65pb0j0mijmswrvpgkdabilqd23x22d95hp5kwxvcramq1dhm";
   };
 
-  buildInputs = [ pkgconfig intltool gtk2 ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ intltool gtk2 ];
 
   meta = {
     description = "Theme engines for GTK+ 2";