treewide: Manual fix more pkg-config build-inputs

6 files changed, 14 insertions, 9 deletions

diff --git a/pkgs/applications/graphics/ao/default.nix b/pkgs/applications/graphics/ao/default.nix
index 7396fdc045f..990fee8cc37 100644
--- a/pkgs/applications/graphics/ao/default.nix
+++ b/pkgs/applications/graphics/ao/default.nix
@@ -5,11 +5,13 @@
 stdenv.mkDerivation rec {
   version = "0.0pre20160820";
   name = "ao-${version}";
+
+  nativeBuildInputs = [ pkgconfig ];
   buildInputs = [
-    cmake ninja boost libpng glfw3 epoxy guile pkgconfig mesa libX11 
+    cmake ninja boost libpng glfw3 epoxy guile mesa libX11 
     libpthreadstubs libXau libXdmcp libXrandr libXext libXinerama libXxf86vm
     libXcursor libXfixes
-    ];
+  ];
 
   src = fetchgit {
     url = https://github.com/mkeeter/ao;
diff --git a/pkgs/applications/graphics/geeqie/default.nix b/pkgs/applications/graphics/geeqie/default.nix
index 9149e19819f..1e8f0e209c0 100644
--- a/pkgs/applications/graphics/geeqie/default.nix
+++ b/pkgs/applications/graphics/geeqie/default.nix
@@ -15,8 +15,9 @@ stdenv.mkDerivation rec {
 
   configureFlags = [ "--enable-gps" ];
 
+  nativeBuildInputs = [ pkgconfig ];
   buildInputs = [
-    pkgconfig autoconf automake gtk2 libpng exiv2 lcms intltool gettext
+    autoconf automake gtk2 libpng exiv2 lcms intltool gettext
   ];
 
   postInstall = ''
diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix
index 678ee79459b..889d710f043 100644
--- a/pkgs/applications/graphics/inkscape/default.nix
+++ b/pkgs/applications/graphics/inkscape/default.nix
@@ -33,8 +33,9 @@ stdenv.mkDerivation rec {
       --replace '"python-interpreter", "python"' '"python-interpreter", "${python2Env}/bin/python"'
   '';
 
+  nativeBuildInputs = [ pkgconfig ];
   buildInputs = [
-    pkgconfig perl perlXMLParser libXft libpng zlib popt boehmgc
+    perl perlXMLParser libXft libpng zlib popt boehmgc
     libxml2 libxslt glib gtkmm2 glibmm libsigcxx lcms boost gettext
     makeWrapper gsl poppler imagemagick libwpg librevenge
     libvisio libcdr libexif potrace cmake python2Env
diff --git a/pkgs/applications/graphics/mtpaint/default.nix b/pkgs/applications/graphics/mtpaint/default.nix
index 51bfa603a05..8a2a218d989 100644
--- a/pkgs/applications/graphics/mtpaint/default.nix
+++ b/pkgs/applications/graphics/mtpaint/default.nix
@@ -16,8 +16,8 @@ stdenv.mkDerivation rec {
     sha256 = "0bvf623g0n2ifijcxv1nw0z3wbs2vhhdky4n04ywsbjlykm44nd1";
   };
 
+  nativeBuildInputs = [ pkgconfig ];
   buildInputs = [
-    pkgconfig
     freetype giflib gtk2 lcms2 libjpeg libpng libtiff openjpeg gifsicle
   ];
 
diff --git a/pkgs/applications/graphics/rawtherapee/default.nix b/pkgs/applications/graphics/rawtherapee/default.nix
index 3edb97e3e20..22e56521658 100644
--- a/pkgs/applications/graphics/rawtherapee/default.nix
+++ b/pkgs/applications/graphics/rawtherapee/default.nix
@@ -13,13 +13,13 @@ stdenv.mkDerivation rec {
     sha256 = "0i3cr3335bw8yxxzn6kcdx6ccinlnxzrdbgl3ld1kym1w2n5449k";
   };
 
+  nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
+
   buildInputs = [
-    pkgconfig cmake pixman libpthreadstubs gtkmm3 libXau libXdmcp
+    cmake pixman libpthreadstubs gtkmm3 libXau libXdmcp
     lcms2 libiptcdata libcanberra_gtk3 fftw expat pcre libsigcxx
   ];
 
-  nativeBuildInputs = [ wrapGAppsHook ];
-
   cmakeFlags = [
     "-DPROC_TARGET_NUMBER=2"
     "-DCACHE_NAME_SUFFIX=\"\""
diff --git a/pkgs/applications/graphics/solvespace/default.nix b/pkgs/applications/graphics/solvespace/default.nix
index f8db30675b1..7b30c467b19 100644
--- a/pkgs/applications/graphics/solvespace/default.nix
+++ b/pkgs/applications/graphics/solvespace/default.nix
@@ -11,8 +11,9 @@ stdenv.mkDerivation rec {
     fetchSubmodules = true;
   };
 
+  nativeBuildInputs = [ pkgconfig ];
   buildInputs = [
-    cmake pkgconfig zlib libpng cairo freetype
+    cmake zlib libpng cairo freetype
     json_c fontconfig gtkmm3 pangomm glew mesa_glu
     xlibs.libpthreadstubs xlibs.libXdmcp pcre
   ];