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

Only acts on one-line dependency lists.

14 files changed, 28 insertions, 14 deletions

diff --git a/pkgs/applications/graphics/exrdisplay/default.nix b/pkgs/applications/graphics/exrdisplay/default.nix
index f15730874744..3386d75e81e1 100644
--- a/pkgs/applications/graphics/exrdisplay/default.nix
+++ b/pkgs/applications/graphics/exrdisplay/default.nix
@@ -18,7 +18,8 @@ stdenv.mkDerivation {
     make LDFLAGS="`fltk-config --ldflags` -lGL -lfltk_gl"
   '';
 
-  buildInputs = [ openexr fltk pkgconfig mesa openexr_ctl ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ openexr fltk mesa openexr_ctl ];
 
   meta = { 
     description = "Application for viewing OpenEXR images on a display at various exposure settings";
diff --git a/pkgs/applications/graphics/exrtools/default.nix b/pkgs/applications/graphics/exrtools/default.nix
index d49110d00693..097062a8258a 100644
--- a/pkgs/applications/graphics/exrtools/default.nix
+++ b/pkgs/applications/graphics/exrtools/default.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
     sha256 = "0jpkskqs1yjiighab4s91jy0c0qxcscwadfn94xy2mm2bx2qwp4z";
   };
 
-  buildInputs = [ stdenv pkgconfig openexr libpng12 libjpeg ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ stdenv openexr libpng12 libjpeg ];
 
   meta = with stdenv.lib; {
     description = "Collection of utilities for manipulating OpenEXR images";
diff --git a/pkgs/applications/graphics/gcolor2/default.nix b/pkgs/applications/graphics/gcolor2/default.nix
index b9cf229e8c86..3747b802e231 100644
--- a/pkgs/applications/graphics/gcolor2/default.nix
+++ b/pkgs/applications/graphics/gcolor2/default.nix
@@ -20,7 +20,8 @@ stdenv.mkDerivation {
         [ ./gcolor2-amd64.patch ] else
         [ ];
 
-buildInputs = [ gtk2 perl perlXMLParser pkgconfig ];
+  nativeBuildInputs = [ pkgconfig ];
+buildInputs = [ gtk2 perl perlXMLParser ];
 
   meta = {
     description = "Simple GTK+2 color selector";
diff --git a/pkgs/applications/graphics/giv/default.nix b/pkgs/applications/graphics/giv/default.nix
index 6c892f1bfd4e..af57115947e0 100644
--- a/pkgs/applications/graphics/giv/default.nix
+++ b/pkgs/applications/graphics/giv/default.nix
@@ -24,7 +24,8 @@ stdenv.mkDerivation rec {
 
   installPhase = "scons install";
 
-  buildInputs = [ gdk_pixbuf pkgconfig gtk2 glib scons pcre cfitsio perl gob2 vala_0_23 libtiff
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ gdk_pixbuf gtk2 glib scons pcre cfitsio perl gob2 vala_0_23 libtiff
     json_glib ];
 
   meta = {
diff --git a/pkgs/applications/graphics/gpicview/default.nix b/pkgs/applications/graphics/gpicview/default.nix
index 7e11c9dea3a7..86867cd1cca7 100644
--- a/pkgs/applications/graphics/gpicview/default.nix
+++ b/pkgs/applications/graphics/gpicview/default.nix
@@ -24,5 +24,6 @@ stdenv.mkDerivation {
     platforms   = platforms.unix;
   };
 
-  buildInputs = [ intltool pkgconfig gtk2 ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ intltool gtk2 ];
 }
diff --git a/pkgs/applications/graphics/gqview/default.nix b/pkgs/applications/graphics/gqview/default.nix
index 801e9c5f502b..a892f98ac475 100644
--- a/pkgs/applications/graphics/gqview/default.nix
+++ b/pkgs/applications/graphics/gqview/default.nix
@@ -13,7 +13,8 @@ stdenv.mkDerivation {
     sha256 = "0ilm5s7ps9kg4f5hzgjhg0xhn6zg0v9i7jnd67zrx9h7wsaa9zhj";
   };
 
-  buildInputs = [pkgconfig gtk2 libpng];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ gtk2 libpng];
 
   hardeningDisable = [ "format" ];
 
diff --git a/pkgs/applications/graphics/grafx2/default.nix b/pkgs/applications/graphics/grafx2/default.nix
index ee9df683c0a2..fd17ef69c992 100644
--- a/pkgs/applications/graphics/grafx2/default.nix
+++ b/pkgs/applications/graphics/grafx2/default.nix
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
     sha256 = "0svsy6rqmdj11b400c242i2ixihyz0hds0dgicqz6g6dcgmcl62q";
   };
 
-  buildInputs = [ SDL SDL_image SDL_ttf libpng zlib lua5 pkgconfig ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ SDL SDL_image SDL_ttf libpng zlib lua5 ];
 
   preBuild = "cd src";
 
diff --git a/pkgs/applications/graphics/ktikz/default.nix b/pkgs/applications/graphics/ktikz/default.nix
index 5d0bbcad54fd..8817071e9843 100644
--- a/pkgs/applications/graphics/ktikz/default.nix
+++ b/pkgs/applications/graphics/ktikz/default.nix
@@ -63,7 +63,8 @@ stdenv.mkDerivation rec {
       qmake PREFIX="$out" ./qtikz.pro
   '';
 
-  buildInputs = [ gettext qt5.full poppler_qt5 pkgconfig ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ gettext qt5.full poppler_qt5 ];
 
   enableParallelBuilding = true;
 }
diff --git a/pkgs/applications/graphics/mozjpeg/default.nix b/pkgs/applications/graphics/mozjpeg/default.nix
index 0ca997adb783..33785a279c7b 100644
--- a/pkgs/applications/graphics/mozjpeg/default.nix
+++ b/pkgs/applications/graphics/mozjpeg/default.nix
@@ -13,7 +13,8 @@ stdenv.mkDerivation rec {
     sed -i -e "s!/usr/bin/file!${file}/bin/file!g" configure
   '';
 
-  buildInputs = [ libpng pkgconfig nasm ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ libpng nasm ];
 
   meta = {
     description = "Mozilla JPEG Encoder Project";
diff --git a/pkgs/applications/graphics/qiv/default.nix b/pkgs/applications/graphics/qiv/default.nix
index 9d147a635f3b..f1a58d4e21b8 100644
--- a/pkgs/applications/graphics/qiv/default.nix
+++ b/pkgs/applications/graphics/qiv/default.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation (rec {
     sha256 = "1rlf5h67vhj7n1y7jqkm9k115nfnzpwngj3kzqsi2lg676srclv7";
   };
 
-  buildInputs = [ pkgconfig gtk2 imlib2 file lcms2 libexif ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ gtk2 imlib2 file lcms2 libexif ];
 
   preBuild=''
     substituteInPlace Makefile --replace /usr/local "$out"
diff --git a/pkgs/applications/graphics/rawtherapee/dev.nix b/pkgs/applications/graphics/rawtherapee/dev.nix
index 71e41faaaef5..fb73feb4a099 100644
--- a/pkgs/applications/graphics/rawtherapee/dev.nix
+++ b/pkgs/applications/graphics/rawtherapee/dev.nix
@@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
     sha256 = "1nwb6b1qrpdyigwig7bvr42lf7na1ngm0q2cislcvb2v1nmk6nlz";
   };
 
-  buildInputs = [ pkgconfig cmake pixman libpthreadstubs gtkmm2 libXau libXdmcp
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ cmake pixman libpthreadstubs gtkmm2 libXau libXdmcp
     lcms2 libiptcdata libcanberra_gtk2 fftw expat pcre libsigcxx ];
 
   NIX_CFLAGS_COMPILE = "-std=gnu++11 -Wno-deprecated-declarations -Wno-unused-result";
diff --git a/pkgs/applications/graphics/sane/xsane.nix b/pkgs/applications/graphics/sane/xsane.nix
index de07a4f1a896..ad02e1a80231 100644
--- a/pkgs/applications/graphics/sane/xsane.nix
+++ b/pkgs/applications/graphics/sane/xsane.nix
@@ -18,7 +18,8 @@ stdenv.mkDerivation rec {
     chmod a+rX -R .
   '';
 
-  buildInputs = [libpng sane-backends sane-frontends libX11 gtk2 pkgconfig ]
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [libpng sane-backends sane-frontends libX11 gtk2 ]
     ++ (if libusb != null then [libusb] else [])
     ++ stdenv.lib.optional gimpSupport gimp_2_8;
 
diff --git a/pkgs/applications/graphics/xzgv/default.nix b/pkgs/applications/graphics/xzgv/default.nix
index 999314429452..763b84d797eb 100644
--- a/pkgs/applications/graphics/xzgv/default.nix
+++ b/pkgs/applications/graphics/xzgv/default.nix
@@ -7,7 +7,8 @@ stdenv.mkDerivation rec {
     url = "mirror://sourceforge/xzgv/xzgv-${version}.tar.gz";
     sha256 = "1rh432wnvzs434knzbda0fslhfx0gngryrrnqkfm6gwd2g5mxcph";
   };
-  buildInputs = [ gtk2 pkgconfig texinfo ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ gtk2 texinfo ];
   patches = [ ./fix-linker-paths.patch ];
   postPatch = ''
     substituteInPlace config.mk \
diff --git a/pkgs/applications/graphics/zgv/default.nix b/pkgs/applications/graphics/zgv/default.nix
index e06b76e35b12..1af165368363 100644
--- a/pkgs/applications/graphics/zgv/default.nix
+++ b/pkgs/applications/graphics/zgv/default.nix
@@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "1fk4i9x0cpnpn3llam0zy2pkmhlr2hy3iaxhxg07v9sizd4dircj";
   };
 
-  buildInputs = [ SDL SDL_image pkgconfig libjpeg libpng libtiff ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ SDL SDL_image libjpeg libpng libtiff ];
 
   hardeningDisable = [ "format" ];