treewide: Manual fix more pkg-config build-inputs

2017-09-14 15:24:37 -04:00 · 2017-09-14 15:24:37 -04:00 · ed14223f8c
commit ed14223f8c
parent 7a733ceda4
198 changed files with 422 additions and 242 deletions
--- a/pkgs/applications/audio/ario/default.nix
+++ b/pkgs/applications/audio/ario/default.nix
@ -14,8 +14,9 @@ stdenv.mkDerivation rec {

  patches = [ ./glib-single-include.patch ];

+  nativeBuildInputs = [ pkgconfig ];
  buildInputs = [
-    pkgconfig gettext gtk2 expat intltool libgcrypt libunique gnutls
+    gettext gtk2 expat intltool libgcrypt libunique gnutls
    libxml2 curl mpd_clientlib dbus_glib libnotify libsoup avahi taglib
  ];

--- a/pkgs/applications/audio/audacity/default.nix
+++ b/pkgs/applications/audio/audacity/default.nix
@ -51,8 +51,9 @@ stdenv.mkDerivation rec {
    "-lswscale"
  ];

+  nativeBuildInputs = [ pkgconfig ];
  buildInputs = [
-    pkgconfig file gettext wxGTK30 expat alsaLib
+    file gettext wxGTK30 expat alsaLib
    libsndfile soxr libid3tag libjack2 lv2 lilv serd sord sratom suil gtk2
    ffmpeg libmad lame libvorbis flac soundtouch
    autoconf automake libtool # for the preConfigure phase
--- a/pkgs/applications/audio/bristol/default.nix
+++ b/pkgs/applications/audio/bristol/default.nix
@ -9,8 +9,9 @@ stdenv.mkDerivation  rec {
    sha256 = "1fi2m4gmvxdi260821y09lxsimq82yv4k5bbgk3kyc3x1nyhn7vx";
  };

+  nativeBuildInputs = [ pkgconfig ];
  buildInputs = [
-    alsaLib libjack2 pkgconfig libpulseaudio xorg.libX11 xorg.libXext
+    alsaLib libjack2 libpulseaudio xorg.libX11 xorg.libXext
    xorg.xproto
  ];

--- a/pkgs/applications/audio/distrho/default.nix
+++ b/pkgs/applications/audio/distrho/default.nix
@ -14,8 +14,9 @@ stdenv.mkDerivation rec {
    sed -e "s#@./scripts#sh scripts#" -i Makefile
  '';

+  nativeBuildInputs = [ pkgconfig ];
  buildInputs = [
-    alsaLib fftwSinglePrec freetype libjack2 pkgconfig premake3
+    alsaLib fftwSinglePrec freetype libjack2 premake3
    xorg.libX11 xorg.libXcomposite xorg.libXcursor xorg.libXext
    xorg.libXinerama xorg.libXrender ladspa-sdk
  ];
--- a/pkgs/applications/audio/gmpc/default.nix
+++ b/pkgs/applications/audio/gmpc/default.nix
@ -14,7 +14,8 @@ stdenv.mkDerivation rec {
      sha256 = "10vspwsgr8pwf3qp2bviw6b2l8prgdiswgv7qiqiyr0h1mmk487y";
    };
    patches = [ ./libmpd-11.8.17-remove-strndup.patch ];
-  nativeBuildInputs = [ pkgconfig ];
+
+    nativeBuildInputs = [ pkgconfig ];
    buildInputs = [ glib ];
  };

@ -23,8 +24,9 @@ stdenv.mkDerivation rec {
    sha256 = "0b3bnxf98i5lhjyljvgxgx9xmb6p46cn3a9cccrng14nagri9556";
  };

+  nativeBuildInputs = [ pkgconfig ];
  buildInputs = [
-    libtool intltool pkgconfig glib gtk2 curl mpd_clientlib libsoup
+    libtool intltool glib gtk2 curl mpd_clientlib libsoup
    libunique libmpd gob2 vala_0_23 libSM libICE sqlite hicolor_icon_theme
    wrapGAppsHook
  ];
--- a/pkgs/applications/audio/hydrogen/default.nix
+++ b/pkgs/applications/audio/hydrogen/default.nix
@ -10,8 +10,9 @@ stdenv.mkDerivation rec {
    sha256 = "1dy2jfkdw0nchars4xi4isrz66fqn53a9qk13bqza7lhmsg3s3qy";
  };

+  nativeBuildInputs = [ pkgconfig ];
  buildInputs = [
-    alsaLib boost cmake glib lash libjack2 libarchive liblrdf libsndfile pkgconfig qt4
+    alsaLib boost cmake glib lash libjack2 libarchive liblrdf libsndfile qt4
  ];

  meta = with stdenv.lib; {
--- a/pkgs/applications/audio/ingen/default.nix
+++ b/pkgs/applications/audio/ingen/default.nix
@ -13,8 +13,9 @@ stdenv.mkDerivation  rec {
    sha256 = "15s8nrzn68hc2s6iw0zshbz3lfnsq0mr6gflq05xm911b7xbp74k";
  };

+  nativeBuildInputs = [ pkgconfig ];
  buildInputs = [
-    boost ganv glibmm gtkmm2 libjack2 lilv lv2 makeWrapper pkgconfig
+    boost ganv glibmm gtkmm2 libjack2 lilv lv2 makeWrapper
    python raul serd sord sratom suil
  ];

--- a/pkgs/applications/audio/jackmix/default.nix
+++ b/pkgs/applications/audio/jackmix/default.nix
@ -9,8 +9,8 @@ stdenv.mkDerivation rec {

  patches = [ ./no_error.patch ];

+  nativeBuildInputs = [ pkgconfig ];
  buildInputs = [
-    pkgconfig
    scons
    qt4
    lash
--- a/pkgs/applications/audio/jalv/default.nix
+++ b/pkgs/applications/audio/jalv/default.nix
@ -10,8 +10,9 @@ stdenv.mkDerivation  rec {
    sha256 = "1x2wpzzx2cgvz3dgdcgsj8dr0w3zsasy62mvl199bsdj5fbjaili";
  };

+  nativeBuildInputs = [ pkgconfig ];
  buildInputs = [
-    gtk2 libjack2 lilv lv2 pkgconfig python serd sord sratom suil
+    gtk2 libjack2 lilv lv2 python serd sord sratom suil
  ];

  configurePhase = "python waf configure --prefix=$out";
--- a/pkgs/applications/audio/jamin/default.nix
+++ b/pkgs/applications/audio/jamin/default.nix
@ -10,8 +10,9 @@ stdenv.mkDerivation {
    sha256 = "0g5v74cm0q3p3pzl6xmnp4rqayaymfli7c6z8s78h9rgd24fwbvn";
  };

+  nativeBuildInputs = [ pkgconfig ];
  buildInputs = [
-    fftwFloat gtk2 ladspaPlugins libjack2 liblo libxml2 pkgconfig perl
+    fftwFloat gtk2 ladspaPlugins libjack2 liblo libxml2 perl
    perlXMLParser makeWrapper
  ];
  
--- a/pkgs/applications/audio/pianobar/default.nix
+++ b/pkgs/applications/audio/pianobar/default.nix
@ -8,8 +8,9 @@ stdenv.mkDerivation rec {
    sha256 = "0n9544bfsdp04xqcjm4nhfvp357dx0c3gpys0rjkq09nzv8b1vy6";
  };

+  nativeBuildInputs = [ pkgconfig ];
  buildInputs = [
-    pkgconfig libao json_c libgcrypt libav curl
+    libao json_c libgcrypt libav curl
  ];

  makeFlags="PREFIX=$(out)";
--- a/pkgs/applications/audio/rhythmbox/default.nix
+++ b/pkgs/applications/audio/rhythmbox/default.nix
@ -26,9 +26,8 @@ in stdenv.mkDerivation rec {
    sha256 = "0f3radhlji7rxl760yl2vm49fvfslympxrpm8497acbmbd7wlhxz";
  };

+  nativeBuildInputs = [ pkgconfig ];
  buildInputs = [
-    pkgconfig
-
    python3
    perl
    perlPackages.XMLParser
--- a/pkgs/applications/audio/rosegarden/default.nix
+++ b/pkgs/applications/audio/rosegarden/default.nix
@ -14,8 +14,9 @@ stdenv.mkDerivation (rec {

  QTDIR = qt4;

+  nativeBuildInputs = [ pkgconfig ];
  buildInputs = [
-    cmake qt4 pkgconfig ladspaPlugins ladspaH dssi liblo liblrdf fftwSinglePrec
+    cmake qt4 ladspaPlugins ladspaH dssi liblo liblrdf fftwSinglePrec
    libsndfile libsamplerate perl makedepend libjack2
  ] ++ stdenv.lib.optional withLirc [ lirc ];

--- a/pkgs/applications/audio/setbfree/default.nix
+++ b/pkgs/applications/audio/setbfree/default.nix
@ -17,8 +17,9 @@ stdenv.mkDerivation  rec {
      -i b_synth/Makefile
  '';

+  nativeBuildInputs = [ pkgconfig ];
  buildInputs = [
-    alsaLib freetype ftgl libjack2 libX11 lv2 mesa pkgconfig
+    alsaLib freetype ftgl libjack2 libX11 lv2 mesa
    ttf_bitstream_vera
  ];

--- a/pkgs/applications/audio/sonata/default.nix
+++ b/pkgs/applications/audio/sonata/default.nix
@ -16,8 +16,9 @@ in buildPythonApplication rec {

  disabled = !isPy3k;

+  nativeBuildInputs = [ pkgconfig ];
  buildInputs = [
-    pkgconfig intltool wrapGAppsHook
+    intltool wrapGAppsHook
    gnome3.gnome_themes_standard gnome3.defaultIconTheme
    gnome3.gsettings_desktop_schemas
  ];
--- a/pkgs/applications/audio/tomahawk/default.nix
+++ b/pkgs/applications/audio/tomahawk/default.nix
@ -25,8 +25,9 @@ stdenv.mkDerivation rec {
    "-DLUCENEPP_LIBRARY_DIR=${lucenepp}/lib"
  ];

+  nativeBuildInputs = [ pkgconfig ];
  buildInputs = [
-    cmake pkgconfig attica boost gnutls libechonest liblastfm lucenepp phonon
+    cmake attica boost gnutls libechonest liblastfm lucenepp phonon
    qca2 qjson qt4 qtkeychain quazip sparsehash taglib websocketpp
    makeWrapper
  ] ++ stdenv.lib.optional enableXMPP      libjreen
--- a/pkgs/applications/editors/monodevelop/default.nix
+++ b/pkgs/applications/editors/monodevelop/default.nix
@ -34,10 +34,10 @@ stdenv.mkDerivation rec {
  patchFlags = [ "-p2" ];
  patches = [ ./git-revert-12d610fb3f6dce121df538e36f21d8c2eeb0a6e3.patch ];

+  nativeBuildInputs = [ pkgconfig ];
  buildInputs = [
-    autoconf automake pkgconfig shared_mime_info intltool
+    autoconf automake shared_mime_info intltool
    mono gtk-sharp-2_0 gnome-sharp unzip
-    pkgconfig
    dotnetPackages.NUnit
    dotnetPackages.NUnitRunners
    dotnetPackages.Nuget
--- a/pkgs/applications/editors/textadept/default.nix
+++ b/pkgs/applications/editors/textadept/default.nix
@ -112,8 +112,9 @@ stdenv.mkDerivation rec {
  version = "9.3";
  name = "textadept-${version}";

+  nativeBuildInputs = [ pkgconfig ];
  buildInputs = [
-    gtk2 glib pkgconfig unzip ncurses zip
+    gtk2 glib unzip ncurses zip
  ];

  src = fetchhg {
--- a/pkgs/applications/editors/vim/macvim.nix
+++ b/pkgs/applications/editors/vim/macvim.nix
@ -17,8 +17,9 @@ stdenv.mkDerivation rec {

  enableParallelBuilding = true;

+  nativeBuildInputs = [ pkgconfig ];
  buildInputs = [
-    gettext ncurses pkgconfig luajit ruby tcl perl python
+    gettext ncurses luajit ruby tcl perl python
  ];

  patches = [ ./macvim.patch ];
--- 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;
--- 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 = ''
--- 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
--- 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
  ];

--- 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=\"\""
--- 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
  ];
--- a/pkgs/applications/misc/apvlv/default.nix
+++ b/pkgs/applications/misc/apvlv/default.nix
@ -15,17 +15,18 @@ stdenv.mkDerivation rec {

  NIX_CFLAGS_COMPILE = "-I${poppler.dev}/include/poppler";

+  nativeBuildInputs = [
+    pkgconfig
+    wrapGAppsHook
+  ];
+
  buildInputs = [
-    pkgconfig cmake
+    cmake
    poppler pcre libxkbcommon epoxy
    freetype gtk3
    libpthreadstubs libXdmcp libxshmfence # otherwise warnings in compilation
  ];

-  nativeBuildInputs = [
-    wrapGAppsHook
-  ];
-
  patches = [
    (fetchpatch {
      url = "https://github.com/naihe2010/apvlv/commit/d432635b9c5ea6c052a2ae1fb71aedec5c4ad57a.patch";
--- a/pkgs/applications/misc/bitcoinarmory/default.nix
+++ b/pkgs/applications/misc/bitcoinarmory/default.nix
@ -24,8 +24,8 @@ in mkPythonDerivation {
  # FIXME bitcoind doesn't die on shutdown. Need some sort of patch to fix that.
  #patches = [ ./shutdown-fix.patch ];

+  nativeBuildInputs = [ pkgconfig ];
  buildInputs = [
-    pkgconfig
    autoreconfHook
    swig
    qt4
--- a/pkgs/applications/misc/cgminer/default.nix
+++ b/pkgs/applications/misc/cgminer/default.nix
@ -11,8 +11,9 @@ stdenv.mkDerivation rec {
    sha256  = "1xfzx91dpwjj1vmhas3v9ybs0p2i74lrhinijmpav15acfggm9fq";
  };

+  nativeBuildInputs = [ pkgconfig ];
  buildInputs = [
-    autoconf automake pkgconfig libtool curl ncurses amdappsdk amdadlsdk
+    autoconf automake libtool curl ncurses amdappsdk amdadlsdk
    xorg.libX11 xorg.libXext xorg.libXinerama jansson
  ];
  configureScript = "./autogen.sh";
--- a/pkgs/applications/misc/fbreader/default.nix
+++ b/pkgs/applications/misc/fbreader/default.nix
@ -9,8 +9,9 @@ stdenv.mkDerivation {
    sha256 = "1sdq3vvwkq4bkyrvh0p884d66gaddz8hlab3m798ji9ixbak2z1x";
  };

+  nativeBuildInputs = [ pkgconfig ];
  buildInputs = [
-    pkgconfig bzip2 curl expat fribidi libunibreak
+    bzip2 curl expat fribidi libunibreak
    qt4 sqlite zlib
  ];

--- a/pkgs/applications/misc/gnuradio-ais/default.nix
+++ b/pkgs/applications/misc/gnuradio-ais/default.nix
@ -16,8 +16,9 @@ stdenv.mkDerivation rec {
    sha256 = "1vl3kk8xr2mh5lf31zdld7yzmwywqffffah8iblxdzblgsdwxfl6";
  };

+  nativeBuildInputs = [ pkgconfig ];
  buildInputs = [
-    cmake pkgconfig boost gnuradio makeWrapper cppunit gnuradio-osmosdr
+    cmake boost gnuradio makeWrapper cppunit gnuradio-osmosdr
  ] ++ stdenv.lib.optionals pythonSupport [ python swig ];

  postInstall = ''
--- a/pkgs/applications/misc/gnuradio-gsm/default.nix
+++ b/pkgs/applications/misc/gnuradio-gsm/default.nix
@ -16,8 +16,9 @@ stdenv.mkDerivation rec {
    sha256 = "13nnq927kpf91iqccr8db9ripy5czjl5jiyivizn6bia0bam2pvx";
  };

+  nativeBuildInputs = [ pkgconfig ];
  buildInputs = [
-    cmake pkgconfig boost gnuradio makeWrapper cppunit libosmocore gnuradio-osmosdr
+    cmake boost gnuradio makeWrapper cppunit libosmocore gnuradio-osmosdr
  ] ++ stdenv.lib.optionals pythonSupport [ python swig ];

  postInstall = ''
--- a/pkgs/applications/misc/gnuradio-nacl/default.nix
+++ b/pkgs/applications/misc/gnuradio-nacl/default.nix
@ -16,8 +16,9 @@ stdenv.mkDerivation rec {
    sha256 = "0q28lgkndcw9921hm6cw5ilxd83n65hjajwl78j50mh6yc3bim35";
  };

+  nativeBuildInputs = [ pkgconfig ];
  buildInputs = [
-    cmake pkgconfig boost gnuradio uhd makeWrapper libsodium cppunit
+    cmake boost gnuradio uhd makeWrapper libsodium cppunit
  ] ++ stdenv.lib.optionals pythonSupport [ python swig ];

  postInstall = ''
--- a/pkgs/applications/misc/gnuradio-osmosdr/default.nix
+++ b/pkgs/applications/misc/gnuradio-osmosdr/default.nix
@ -15,8 +15,9 @@ stdenv.mkDerivation rec {
    sha256 = "0vyzr4fhkblf2v3d7m0ch5hws4c493jw3ydl4y6b2dfbfzchhsz8";
  };

+  nativeBuildInputs = [ pkgconfig ];
  buildInputs = [
-    cmake pkgconfig boost gnuradio rtl-sdr uhd makeWrapper hackrf
+    cmake boost gnuradio rtl-sdr uhd makeWrapper hackrf
  ] ++ stdenv.lib.optionals pythonSupport [ python swig ];

  postInstall = ''
--- a/pkgs/applications/misc/gnuradio-rds/default.nix
+++ b/pkgs/applications/misc/gnuradio-rds/default.nix
@ -15,8 +15,9 @@ stdenv.mkDerivation rec {
    sha256 = "008284ya464q4h4fd0zvcn6g7bym231p8fl3kdxncz9ks4zsbsxs";
  };

+  nativeBuildInputs = [ pkgconfig ];
  buildInputs = [
-    cmake pkgconfig boost gnuradio makeWrapper
+    cmake boost gnuradio makeWrapper
  ] ++ stdenv.lib.optionals pythonSupport [ python swig ];

  postInstall = ''
--- a/pkgs/applications/misc/gnuradio/default.nix
+++ b/pkgs/applications/misc/gnuradio/default.nix
@ -30,8 +30,9 @@ stdenv.mkDerivation rec {
    sha256 = "1m2jf8lafr6pr2dlm40nbvr6az8gwjfkzpbs4fxzv3l5hcqvmnc7";
  };

+  nativeBuildInputs = [ pkgconfig ];
  buildInputs = [
-    cmake pkgconfig git boost cppunit fftw python swig2 orc lxml qt4
+    cmake git boost cppunit fftw python swig2 orc lxml qt4
    qwt alsaLib SDL libusb1 uhd gsl makeWrapper
  ];

--- a/pkgs/applications/misc/goldendict/default.nix
+++ b/pkgs/applications/misc/goldendict/default.nix
@ -9,13 +9,12 @@ stdenv.mkDerivation rec {
    sha256 = "1pizz39l61rbps0wby75fkvzyrah805257j33siqybwhsfiy1kmw";
  };

+  nativeBuildInputs = [ pkgconfig qmake ];
  buildInputs = [
-    pkgconfig qtbase qtsvg qtwebkit qtx11extras qttools
+    qtbase qtsvg qtwebkit qtx11extras qttools
    libXtst libvorbis hunspell libao ffmpeg libeb lzo xz libtiff
  ];

-  nativeBuildInputs = [ qmake ];
-
  qmakeFlags = [ "CONFIG+=zim_support" ];

  meta = {
--- a/pkgs/applications/misc/gphoto2/gphotofs.nix
+++ b/pkgs/applications/misc/gphoto2/gphotofs.nix
@ -8,8 +8,9 @@ stdenv.mkDerivation rec {
    sha256 = "1k23ncbsbh64r7kz050bg31jqamchyswgg9izhzij758d7gc8vk7";
  };

+  nativeBuildInputs = [ pkgconfig ];
  buildInputs = [
-    libgphoto2 fuse pkgconfig glib libtool
+    libgphoto2 fuse glib libtool
  ];

  meta = {
--- a/pkgs/applications/misc/gxneur/default.nix
+++ b/pkgs/applications/misc/gxneur/default.nix
@ -8,8 +8,9 @@ stdenv.mkDerivation {
    sha256 = "f093428a479158247a7ff8424f0aec9af9f7b1d05b191cf30b7c534965a6839f";
  };

+  nativeBuildInputs = [ pkgconfig ];
  buildInputs = [
-    xorg.libX11 pkgconfig  glib gtk2 xorg.libXpm xorg.libXt xorg.libXext xneur_0_13
+    xorg.libX11 glib gtk2 xorg.libXpm xorg.libXt xorg.libXext xneur_0_13
    libglade GConf pcre
  ];

--- a/pkgs/applications/misc/hackrf/default.nix
+++ b/pkgs/applications/misc/hackrf/default.nix
@ -10,8 +10,9 @@ stdenv.mkDerivation rec {
    sha256 = "16hd61icvzaciv7s9jpgm9c8q6m4mwvj97gxrb20sc65p5gjb7hv";
  };

+  nativeBuildInputs = [ pkgconfig ];
  buildInputs = [
-    cmake pkgconfig libusb fftwSinglePrec
+    cmake libusb fftwSinglePrec
  ];

  cmakeFlags = [ "-DUDEV_RULES_GROUP=plugdev" "-DUDEV_RULES_PATH=lib/udev/rules.d" ];
--- a/pkgs/applications/misc/inspectrum/default.nix
+++ b/pkgs/applications/misc/inspectrum/default.nix
@ -19,8 +19,8 @@ stdenv.mkDerivation rec {
    sha256 = "1fvnr8gca25i6s9mg9b2hyqs0zzr4jicw13mimc9dhrgxklrr1yv";
  };

+  nativeBuildInputs = [ pkgconfig ];
  buildInputs = [
-    pkgconfig
    cmake
    qt5.qtbase
    fftwFloat
--- a/pkgs/applications/misc/kiwix/default.nix
+++ b/pkgs/applications/misc/kiwix/default.nix
@ -62,8 +62,9 @@ stdenv.mkDerivation rec {
    sha256 = "0577phhy2na59cpcqjgldvksp0jwczyg0l6c9ghnr19i375l7yqc";
  };

+  nativeBuildInputs = [ pkgconfig ];
  buildInputs = [
-    zip pkgconfig python zlib xapian which icu libmicrohttpd
+    zip python zlib xapian which icu libmicrohttpd
    lzma zimlib ctpp2 aria2 wget bc libuuid makeWrapper pugixml
  ];

--- a/pkgs/applications/misc/lenmus/default.nix
+++ b/pkgs/applications/misc/lenmus/default.nix
@ -29,8 +29,8 @@ stdenv.mkDerivation rec {
    })
  ];

+  nativeBuildInputs = [ pkgconfig ];
  buildInputs = [
-    pkgconfig
    cmake boost
    portmidi sqlite
    freetype libpng pngpp zlib
--- a/pkgs/applications/misc/libosmocore/default.nix
+++ b/pkgs/applications/misc/libosmocore/default.nix
@ -12,8 +12,9 @@ stdenv.mkDerivation rec {
    sha256 = "08mcpy9ljwb1i3l4cmlwn024q2psk5gg9f0ylgh99hy1ffx0n7am";
  };

+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
  buildInputs = [
-    autoreconfHook pcsclite pkgconfig
+    pcsclite
  ];

  preConfigure = ''
--- a/pkgs/applications/misc/lighthouse/default.nix
+++ b/pkgs/applications/misc/lighthouse/default.nix
@ -13,8 +13,9 @@ stdenv.mkDerivation rec {
    sha256 = "0v6ylm49f1b44zwq1y1gqxp2csyqblplr24ajllc2q3r0sc9m1ys";
   };

+  nativeBuildInputs = [ pkgconfig ];
  buildInputs = [
-    pkgconfig libX11 libxcb cairo gtk2 pango python27 python3
+    libX11 libxcb cairo gtk2 pango python27 python3
  ];

  makeFlags = [ "PREFIX=\${out}" ];
--- a/pkgs/applications/misc/lyx/default.nix
+++ b/pkgs/applications/misc/lyx/default.nix
@ -12,8 +12,9 @@ stdenv.mkDerivation rec {
  };

  # LaTeX is used from $PATH, as people often want to have it with extra pkgs
+  nativeBuildInputs = [ pkgconfig ];
  buildInputs = [
-    pkgconfig qtbase qtsvg python file/*for libmagic*/ bc
+    qtbase qtsvg python file/*for libmagic*/ bc
    hunspell makeWrapper # enchant
  ];

--- a/pkgs/applications/misc/milu/default.nix
+++ b/pkgs/applications/misc/milu/default.nix
@ -24,8 +24,8 @@ stdenv.mkDerivation rec {
    cp bin/milu $out/bin
  '';

+  nativeBuildInputs = [ pkgconfig ];
  buildInputs = [
-     pkgconfig
     glib
     unzip
     clang
--- a/pkgs/applications/misc/notify-osd/default.nix
+++ b/pkgs/applications/misc/notify-osd/default.nix
@ -9,8 +9,9 @@ stdenv.mkDerivation rec {
    sha256 = "0g5a7a680b05x27apz0y1ldl5csxpp152wqi42s107jymbp0s20j";
  };

+  nativeBuildInputs = [ pkgconfig ];
  buildInputs = [
-    pkgconfig glib libwnck3 libnotify dbus_glib makeWrapper
+    glib libwnck3 libnotify dbus_glib makeWrapper
    gnome3.gsettings_desktop_schemas
  ];

--- a/pkgs/applications/misc/pdfmod/default.nix
+++ b/pkgs/applications/misc/pdfmod/default.nix
@ -18,8 +18,9 @@ stdenv.mkDerivation rec {
    sha256 = "0fpz9ifr6476lqhd5rkb94dm68vlrwdq5w1aaxzgyjgdax9hxx81";
  }) ];

+  nativeBuildInputs = [ pkgconfig ];
  buildInputs = [
-    pkgconfig gnome_doc_utils intltool mono gtk-sharp-2_0 gnome-sharp
+    gnome_doc_utils intltool mono gtk-sharp-2_0 gnome-sharp
    hyena which makeWrapper wrapGAppsHook
  ];

--- a/pkgs/applications/misc/qpdfview/default.nix
+++ b/pkgs/applications/misc/qpdfview/default.nix
@ -10,13 +10,14 @@ let
    url="https://launchpad.net/qpdfview/trunk/${version}/+download/qpdfview-${version}.tar.gz";
    sha256 = "0zysjhr58nnmx7ba01q3zvgidkgcqxjdj4ld3gx5fc7wzvl1dm7s";
  };
+  nativeBuildInputs = [ pkgconfig ];
  buildInputs = [
-    qt4 poppler_qt4 pkgconfig djvulibre libspectre cups file ghostscript
+    qt4 poppler_qt4 djvulibre libspectre cups file ghostscript
  ];
 in
 stdenv.mkDerivation {
  inherit (s) name version;
-  inherit buildInputs;
+  inherit nativeBuildInputs buildInputs;
  src = fetchurl {
    inherit (s) url sha256;
  };
--- a/pkgs/applications/misc/quicksynergy/default.nix
+++ b/pkgs/applications/misc/quicksynergy/default.nix
@ -7,8 +7,9 @@ stdenv.mkDerivation rec {
    url = "mirror://sourceforge/project/quicksynergy/Linux/${version}/quicksynergy-${version}.tar.gz";
    sha256 = "1pi8503bg8q1psw50y6d780i33nnvfjqiy9vnr3v52pdcfip8pix";
  };
+
+  nativeBuildInputs = [ pkgconfig ];
  buildInputs = [
-    pkgconfig
    gtk2
    synergy
  ];
--- a/pkgs/applications/misc/redis-desktop-manager/default.nix
+++ b/pkgs/applications/misc/redis-desktop-manager/default.nix
@ -24,10 +24,9 @@ stdenv.mkDerivation rec {
    sha256 = "0a7xa39qp1q32zkypw32mm3wi8wbhxhvrm6l3xsa3k1jzih7hzxr";
  };

-  nativeBuildInputs = [ qmake ];
-
+  nativeBuildInputs = [ pkgconfig qmake ];
  buildInputs = [
-    pkgconfig libssh2 qtbase qtdeclarative qtgraphicaleffects qtimageformats
+    libssh2 qtbase qtdeclarative qtgraphicaleffects qtimageformats
    qtquick1 qtquickcontrols qtsvg qttools
  ];

--- a/pkgs/applications/misc/spacefm/default.nix
+++ b/pkgs/applications/misc/spacefm/default.nix
@ -26,8 +26,9 @@ stdenv.mkDerivation rec {
    ln -s /etc/spacefm/spacefm.conf $out/etc/spacefm/spacefm.conf 
  '';

+  nativeBuildInputs = [ pkgconfig ];
  buildInputs = [
-    gtk3 udev desktop_file_utils shared_mime_info intltool pkgconfig
+    gtk3 udev desktop_file_utils shared_mime_info intltool
    wrapGAppsHook ffmpegthumbnailer jmtpfs lsof udisks
  ] ++ (if ifuseSupport then [ ifuse ] else []);
  # Introduced because ifuse doesn't build due to CVEs in libplist
--- a/pkgs/applications/misc/synapse/default.nix
+++ b/pkgs/applications/misc/synapse/default.nix
@ -12,8 +12,9 @@ stdenv.mkDerivation rec {
    sha256 = "846d8a5130580bb47c754bb7f20dc76311e589c00a18b02370a5d78b52409220";
  };

+  nativeBuildInputs = [ pkgconfig ];
  buildInputs = [
-    intltool pkgconfig glib libnotify gtk3 libgee keybinder3 json_glib zeitgeist 
+    intltool glib libnotify gtk3 libgee keybinder3 json_glib zeitgeist 
    vala_0_23 hicolor_icon_theme
  ];

--- a/pkgs/applications/misc/zathura/core/default.nix
+++ b/pkgs/applications/misc/zathura/core/default.nix
@ -19,8 +19,9 @@ stdenv.mkDerivation rec {

  icon = ./icon.xpm;

+  nativeBuildInputs = [ pkgconfig ];
  buildInputs = [
-    pkgconfig file gtk girara
+    file gtk girara
    gettext makeWrapper sqlite glib
  ] ++ optional synctexSupport texlive.bin.core;

--- a/pkgs/applications/networking/instant-messengers/freetalk/default.nix
+++ b/pkgs/applications/networking/instant-messengers/freetalk/default.nix
@ -19,8 +19,9 @@ stdenv.mkDerivation rec {
    ./autogen.sh
  '';

+ nativeBuildInputs = [ pkgconfig ];
 buildInputs = [
-    guile pkgconfig glib loudmouth gmp libidn readline libtool
+    guile glib loudmouth gmp libidn readline libtool
    libunwind ncurses curl jansson texinfo
    autoconf automake
  ];
--- a/pkgs/applications/networking/instant-messengers/profanity/default.nix
+++ b/pkgs/applications/networking/instant-messengers/profanity/default.nix
@ -21,8 +21,9 @@ stdenv.mkDerivation rec {
    sha256 = "1f7ylw3mhhnii52mmk40hyc4kqhpvjdr3hmsplzkdhsfww9kflg3";
  };

+  nativeBuildInputs = [ pkgconfig ];
  buildInputs = [
-    pkgconfig readline libuuid libmesode
+    readline libuuid libmesode
    glib openssl expat ncurses libotr curl
  ] ++ optionals autoAwaySupport [ libXScrnSaver libX11 ]
    ++ optionals notifySupport   [ libnotify gdk_pixbuf ]
--- a/pkgs/applications/networking/mailreaders/lumail/default.nix
+++ b/pkgs/applications/networking/mailreaders/lumail/default.nix
@ -12,8 +12,9 @@ stdenv.mkDerivation {
    sha256 = "1rni5lbic36v4cd1r0l28542x0hlmfqkl6nac79gln491in2l2sc";
  };

+  nativeBuildInputs = [ pkgconfig ];
  buildInputs = [
-    pkgconfig lua5_2 file ncurses gmime pcre-cpp
+    lua5_2 file ncurses gmime pcre-cpp
    perl perlPackages.JSON perlPackages.NetIMAPClient
  ];

--- a/pkgs/applications/networking/mailreaders/notmuch/default.nix
+++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix
@ -25,8 +25,9 @@ stdenv.mkDerivation rec {
    sha256 = "02z6d87ip1hkipz8d7w0sfklg8dd5fd5vlgp768640ixg0gqvlk5";
  };

+  nativeBuildInputs = [ pkgconfig ];
  buildInputs = [
-    pkgconfig gnupg # undefined dependencies
+    gnupg # undefined dependencies
    xapian gmime talloc zlib  # dependencies described in INSTALL
    doxygen perl  # (optional) api docs
    pythonPackages.sphinx pythonPackages.python  # (optional) documentation -> doc/INSTALL
--- a/pkgs/applications/networking/p2p/transgui/default.nix
+++ b/pkgs/applications/networking/p2p/transgui/default.nix
@ -11,8 +11,9 @@ stdenv.mkDerivation rec {
    sha256 = "0z83hvlhllm6p1z4gkcfi1x3akgn2xkssnfhwp74qynb0n5362pi";
  };

+  nativeBuildInputs = [ pkgconfig ];
  buildInputs = [
-    pkgconfig unzip fpc lazarus stdenv.cc
+    unzip fpc lazarus stdenv.cc
    libX11 glib gtk2 gdk_pixbuf pango atk cairo openssl
  ];

--- a/pkgs/applications/networking/p2p/twister/default.nix
+++ b/pkgs/applications/networking/p2p/twister/default.nix
@ -32,8 +32,9 @@ in stdenv.mkDerivation rec {
    "--with-boost-libdir=${boost.out}/lib"
  ];

+  nativeBuildInputs = [ pkgconfig ];
  buildInputs = [
-    autoconf automake libtool pkgconfig python2
+    autoconf automake libtool python2
    boost db openssl geoip miniupnpc libiconv
  ];

--- a/pkgs/applications/networking/sniffers/etherape/default.nix
+++ b/pkgs/applications/networking/sniffers/etherape/default.nix
@ -9,8 +9,10 @@ stdenv.mkDerivation rec {
  };

  configureFlags = [ "--disable-scrollkeeper" ];
+
+  nativeBuildInputs = [ pkgconfig ];
  buildInputs = [
-    pkgconfig libtool gtk2 libpcap libglade libgnome libgnomeui gnomedocutils
+    libtool gtk2 libpcap libglade libgnome libgnomeui gnomedocutils
    scrollkeeper libxslt
  ];

--- a/pkgs/applications/networking/sniffers/wireshark/default.nix
+++ b/pkgs/applications/networking/sniffers/wireshark/default.nix
@ -26,11 +26,11 @@ in stdenv.mkDerivation {
  cmakeFlags = optional withGtk "-DBUILD_wireshark_gtk=TRUE";

  nativeBuildInputs = [
-    bison cmake extra-cmake-modules flex
+    bison cmake extra-cmake-modules flex pkgconfig
  ] ++ optional withGtk wrapGAppsHook;

  buildInputs = [
-    gettext pcre perl pkgconfig libpcap lua5 libssh openssl libgcrypt
+    gettext pcre perl libpcap lua5 libssh openssl libgcrypt
    libgpgerror gnutls geoip c-ares python glib zlib
  ] ++ optionals withQt  (with qt5; [ qtbase qtmultimedia qtsvg qttools ])
    ++ optionals withGtk [ gtk3 librsvg gsettings_desktop_schemas ]
--- a/pkgs/applications/office/gnucash/default.nix
+++ b/pkgs/applications/office/gnucash/default.nix
@ -17,8 +17,9 @@ stdenv.mkDerivation rec {
    sha256 = "058mgfwic6a2g7jq6iip5hv45md1qaxy25dj4lvlzjjr141wm4gx";
  };

+  nativeBuildInputs = [ pkgconfig ];
  buildInputs = [
-    pkgconfig libxml2 gconf glib gtk2 libgnomeui libgtkhtml gtkhtml
+    libxml2 gconf glib gtk2 libgnomeui libgtkhtml gtkhtml
    libgnomeprint goffice enchant gettext intltool perl guile slibGuile
    swig isocodes bzip2 makeWrapper libofx libglade libgsf libart_lgpl
    perlPackages.DateManip perlPackages.FinanceQuote aqbanking gwenhywfar
--- a/pkgs/applications/office/gnumeric/default.nix
+++ b/pkgs/applications/office/gnumeric/default.nix
@ -25,9 +25,11 @@ in stdenv.mkDerivation rec {
 	--replace http://www.oasis-open.org/docbook/xml/4.5/ent/isogrk1.ent ${isogrk1}
  '';

+  nativeBuildInputs = [ pkgconfig ];
+
  # ToDo: optional libgda, introspection?
  buildInputs = [
-    pkgconfig intltool perl perlXMLParser bison
+    intltool perl perlXMLParser bison
    goffice gtk3 makeWrapper gnome3.defaultIconTheme
    python pygobject3 itstool
  ];
--- a/pkgs/applications/science/robotics/gazebo/default.nix
+++ b/pkgs/applications/science/robotics/gazebo/default.nix
@ -38,8 +38,12 @@ stdenv.mkDerivation rec {
    ++ optional withLowMemorySupport [ "-DUSE_LOW_MEMORY_TESTS=True" ]
    ++ optional withHeadless [ "-DENABLE_SCREEN_TESTS=False" ];

+  nativeBuildInputs = [ cmake pkgconfig ];
+
+  propagatedNativeBuildInputs = [ boost boost-build boost_process protobuf ];
+
  buildInputs = [
-    #cmake pkgconfig boost protobuf
+    #cmake boost protobuf
    freeimage
    xorg_sys_opengl
    tbb
@ -69,10 +73,6 @@ stdenv.mkDerivation rec {
    ++ optional withConstructiveSolidGeometrySupport gts
    ++ optional withHdf5Support hdf5;

-  nativeBuildInputs = [ cmake pkgconfig ];
-
-  propagatedNativeBuildInputs = [ boost boost-build boost_process protobuf ];
-
  meta = with stdenv.lib; {
    homepage = http://gazebosim.org/;
    description = "Multi-robot simulator for outdoor environments";
--- a/pkgs/applications/version-management/bitkeeper/default.nix
+++ b/pkgs/applications/version-management/bitkeeper/default.nix
@ -15,8 +15,9 @@ stdenv.mkDerivation rec {

  enableParallelBuilding = true;

+  nativeBuildInputs = [ pkgconfig ];
  buildInputs = [
-    perl gperf bison groff libXft pkgconfig
+    perl gperf bison groff libXft
    pcre libtomcrypt libtommath lz4
  ];

--- a/pkgs/applications/version-management/git-and-tools/cgit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/cgit/default.nix
@ -20,8 +20,9 @@ stdenv.mkDerivation rec {
    sha256 = "0wc64dzcxrzgi6kwcljz6y3cwm3ajdgf6aws7g58azbhvl1jk04l";
  };

+  nativeBuildInputs = [ pkgconfig ];
  buildInputs = [
-    openssl zlib asciidoc libxml2 libxslt docbook_xml_xslt pkgconfig luajit
+    openssl zlib asciidoc libxml2 libxslt docbook_xml_xslt luajit
  ];

  postPatch = ''
--- a/pkgs/applications/version-management/gource/default.nix
+++ b/pkgs/applications/version-management/gource/default.nix
@ -11,8 +11,9 @@ stdenv.mkDerivation rec {
    sha256 = "0z095zsf5pz8czh7nmlkdy29rm93w83sqyqspg2zsprh892cl116";
  };

+  nativeBuildInputs = [ pkgconfig ];
  buildInputs = [
-    glew SDL ftgl pkgconfig libpng libjpeg pcre SDL_image mesa
+    glew SDL ftgl libpng libjpeg pcre SDL_image mesa
    boost glm freetype
  ];

--- a/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix
+++ b/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix
@ -12,8 +12,9 @@ stdenv.mkDerivation rec {
    sha256 = "39b8e1f2ba4cc1f5bdc8e39c7be35e5f831253008e4ee2c176984f080416676c";
  };

+  nativeBuildInputs = [ pkgconfig ];
  buildInputs = [
-    pkgconfig xlibsWrapper libpng libjpeg expat libXaw yacc
+    xlibsWrapper libpng libjpeg expat libXaw yacc
    libtool fontconfig pango gd libwebp
  ];

--- a/pkgs/applications/version-management/redmine/bootstrap.nix
+++ b/pkgs/applications/version-management/redmine/bootstrap.nix
@ -13,8 +13,10 @@ in stdenv.mkDerivation rec {
    url = "http://www.redmine.org/releases/${name}.tar.gz";
    sha256 = "0x0zwxyj4dwbk7l64s3lgny10mjf0ba8jwrbafsm4d72sncmacv0";
  };
+
+  nativeBuildInputs = [ pkgconfig ];
  buildInputs = [
-    ruby bundler libiconv libxslt libxml2 pkgconfig
+    ruby bundler libiconv libxslt libxml2
    libffi imagemagickBig postgresql which stdenv
  ];
  installPhase = ''
--- a/pkgs/applications/video/natron/default.nix
+++ b/pkgs/applications/video/natron/default.nix
@ -20,14 +20,14 @@ let
    nativeBuildInputs = [ cmake ];
    buildInputs = [ libpng flex bison ];
  };
-  buildPlugin = { pluginName, sha256, buildInputs, preConfigure ? "" }:
+  buildPlugin = { pluginName, sha256, nativeBuildInputs ? [], buildInputs ? [], preConfigure ? "" }:
    stdenv.mkDerivation {
      name = "openfx-${pluginName}-${version}";
      src = fetchurl {
        url = "https://github.com/MrKepzie/Natron/releases/download/${version}/openfx-${pluginName}-${version}.tar.xz";
        inherit sha256;
      };
-      inherit buildInputs;
+      inherit nativeBuildInputs buildInputs;
      preConfigure = ''
        makeFlagsArray+=("CONFIG=release")
        makeFlagsArray+=("PLUGINPATH=$out/Plugins/OFX/Natron")
@ -50,8 +50,9 @@ let
    ({
      pluginName = "arena";
      sha256 = "0qba13vn9qdfax7nqlz1ps27zspr5kh795jp1xvbmwjzjzjpkqkf";
+      nativeBuildInputs = [ pkgconfig ];
      buildInputs = [
-        pkgconfig pango librsvg librevenge libcdr opencolorio libxml2 libzip
+        pango librsvg librevenge libcdr opencolorio libxml2 libzip
        poppler imagemagick
      ];
      preConfigure = ''
@ -65,8 +66,9 @@ let
    ({
      pluginName = "io";
      sha256 = "0s196i9fkgr9iw92c94mxgs1lkxbhynkf83vmsgrldflmf0xjky7";
+      nativeBuildInputs = [ pkgconfig ];
      buildInputs = [
-        pkgconfig libpng ffmpeg openexr opencolorio openimageio boost mesa_noglu
+        libpng ffmpeg openexr opencolorio openimageio boost mesa_noglu
        seexpr
      ];
    })
@ -91,11 +93,11 @@ stdenv.mkDerivation {
    sha256 = "1wdc0zqriw2jhlrhzs6af3kagrv22cm086ffnbr1x43mgc9hfhjp";
  };

-  buildInputs = [
-    pkgconfig qt4 boost expat cairo python2Packages.pyside python2Packages.pysideShiboken
-  ];
+  nativeBuildInputs = [ qmake4Hook pkgconfig python2Packages.wrapPython ];

-  nativeBuildInputs = [ qmake4Hook python2Packages.wrapPython ];
+  buildInputs = [
+    qt4 boost expat cairo python2Packages.pyside python2Packages.pysideShiboken
+  ];

  preConfigure = ''
    export MAKEFLAGS=-j$NIX_BUILD_CORES
--- a/pkgs/applications/video/simplescreenrecorder/default.nix
+++ b/pkgs/applications/video/simplescreenrecorder/default.nix
@ -24,8 +24,9 @@ stdenv.mkDerivation rec {
    done
  '';

-  buildInputs = [
-    alsaLib ffmpeg libjack2 libX11 libXext libXfixes mesa pkgconfig
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [  
+    alsaLib ffmpeg libjack2 libX11 libXext libXfixes mesa
    libpulseaudio qt4
  ];

--- a/pkgs/applications/video/xvidcap/default.nix
+++ b/pkgs/applications/video/xvidcap/default.nix
@ -11,8 +11,10 @@ stdenv.mkDerivation {
  };

  patches = [ ./xlib.patch ];
+
+  nativeBuildInputs = [ pkgconfig ];
  buildInputs = [
-    perl perlXMLParser pkgconfig gtk2 scrollkeeper
+    perl perlXMLParser gtk2 scrollkeeper
    libglade libXmu gettext lame libXdamage libXfixes libXext libX11
  ];

--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@ -66,8 +66,9 @@ rec {
    # Optimizations break compilation of libseccomp c bindings
    hardeningDisable = [ "fortify" ];

+    nativeBuildInputs = [ pkgconfig ];
    buildInputs = [
-      makeWrapper removeReferencesTo pkgconfig go-md2man go
+      makeWrapper removeReferencesTo go-md2man go
      sqlite devicemapper btrfs-progs systemd libtool libseccomp
    ];

--- a/pkgs/applications/virtualization/xen/generic.nix
+++ b/pkgs/applications/virtualization/xen/generic.nix
@ -53,8 +53,9 @@ stdenv.mkDerivation (rec {

  hardeningDisable = [ "stackprotector" "fortify" "pic" ];

+  nativeBuildInputs = [ pkgconfig ];
  buildInputs = [
-    cmake pkgconfig which
+    cmake which

    # Xen
    bison bzip2 checkpolicy dev86 figlet flex gettext glib iasl libaio
--- a/pkgs/applications/window-managers/fvwm/default.nix
+++ b/pkgs/applications/window-managers/fvwm/default.nix
@ -17,8 +17,9 @@ stdenv.mkDerivation rec {
    sha256 = "01654d5abdcde6dac131cae9befe5cf6f01f9f7524d097c3b0f316e39f84ef73";
  };

+  nativeBuildInputs = [ pkgconfig ];
  buildInputs = [
-    pkgconfig cairo fontconfig freetype
+    cairo fontconfig freetype
    libXft libXcursor libXinerama libXpm libXt
    librsvg libpng fribidi perl
  ] ++ stdenv.lib.optional gestures libstroke;
--- a/pkgs/applications/window-managers/openbox/default.nix
+++ b/pkgs/applications/window-managers/openbox/default.nix
@ -6,8 +6,9 @@ stdenv.mkDerivation rec {
  name = "openbox-${version}";
  version = "3.6.1";

+  nativeBuildInputs = [ pkgconfig ];
  buildInputs = [
-    pkgconfig libxml2
+    libxml2
    libXinerama libXcursor libXau libXrandr libICE libSM
    libstartup_notification makeWrapper
    python2.pkgs.wrapPython
--- a/pkgs/build-support/build-dotnet-package/default.nix
+++ b/pkgs/build-support/build-dotnet-package/default.nix
@ -19,8 +19,8 @@ attrsOrig @
    attrs = {
      name = "${baseName}-${version}";

+      nativeBuildInputs = [ pkgconfig ];
      buildInputs = [
-        pkgconfig
        mono
        dotnetbuildhelpers
        makeWrapper
--- a/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix
@ -26,8 +26,9 @@ stdenv.mkDerivation rec {
    })
  ];

+  nativeBuildInputs = [ pkgconfig ];
  buildInputs = [
-    pkgconfig atk cairo glib gtk
+    atk cairo glib gtk
    pango libxml2Python perl intltool
    gettext
  ] ++ optionals stdenv.isDarwin [
--- a/pkgs/desktops/gnome-3/3.24/apps/accerciser/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/apps/accerciser/default.nix
@ -5,8 +5,9 @@
 stdenv.mkDerivation rec {
  inherit (import ./src.nix fetchurl) src name;

+  nativeBuildInputs = [ pkgconfig ];
  buildInputs = [
-    pkgconfig gtk3 wrapGAppsHook itstool libxml2 python3Packages.python python3Packages.pyatspi
+    gtk3 wrapGAppsHook itstool libxml2 python3Packages.python python3Packages.pyatspi
    python3Packages.pygobject3 python3Packages.ipython
    at_spi2_core dbus intltool libwnck3 gnome3.defaultIconTheme
  ];
--- a/pkgs/desktops/gnome-3/3.24/apps/gnome-calendar/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/apps/gnome-calendar/default.nix
@ -7,8 +7,9 @@ stdenv.mkDerivation rec {

  NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";

+  nativeBuildInputs = [ pkgconfig ];
  buildInputs = [
-    pkgconfig gtk3 wrapGAppsHook intltool evolution_data_server
+    gtk3 wrapGAppsHook intltool evolution_data_server
    sqlite libxml2 libsoup glib gnome3.defaultIconTheme gnome_online_accounts
    gsettings_desktop_schemas
  ];
--- a/pkgs/desktops/gnome-3/3.24/apps/gnome-characters/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/apps/gnome-characters/default.nix
@ -4,8 +4,9 @@
 stdenv.mkDerivation rec {
  inherit (import ./src.nix fetchurl) name src;

+  nativeBuildInputs = [ pkgconfig ];
  buildInputs = [
-    pkgconfig gtk3 wrapGAppsHook intltool gjs gdk_pixbuf
+    gtk3 wrapGAppsHook intltool gjs gdk_pixbuf
    librsvg gnome3.gsettings_desktop_schemas gnome3.defaultIconTheme
  ];

--- a/pkgs/desktops/gnome-3/3.24/apps/gnome-logs/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/apps/gnome-logs/default.nix
@ -6,8 +6,9 @@ stdenv.mkDerivation rec {

  configureFlags = [ "--disable-tests" ];

+  nativeBuildInputs = [ pkgconfig ];
  buildInputs = [
-    pkgconfig gtk3 wrapGAppsHook intltool itstool libxml2
+    gtk3 wrapGAppsHook intltool itstool libxml2
    systemd gnome3.gsettings_desktop_schemas gnome3.defaultIconTheme
  ];

--- a/pkgs/desktops/gnome-3/3.24/apps/gnome-nettool/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/apps/gnome-nettool/default.nix
@ -9,8 +9,9 @@ stdenv.mkDerivation rec {
    sha256 = "1c9cvzvyqgfwa5zzyvp7118pkclji62fkbb33g4y9sp5kw6m397h";
  };

+  nativeBuildInputs = [ pkgconfig ];
  buildInputs = [
-    pkgconfig gtk3 wrapGAppsHook libgtop intltool itstool libxml2
+    gtk3 wrapGAppsHook libgtop intltool itstool libxml2
    gnome3.defaultIconTheme
  ];

--- a/pkgs/desktops/gnome-3/3.24/apps/gnome-weather/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/apps/gnome-weather/default.nix
@ -4,8 +4,9 @@
 stdenv.mkDerivation rec {
  inherit (import ./src.nix fetchurl) name src;

+  nativeBuildInputs = [ pkgconfig ];
  buildInputs = [
-    pkgconfig gtk3 wrapGAppsHook gjs intltool itstool
+    gtk3 wrapGAppsHook gjs intltool itstool
    libgweather gnome3.defaultIconTheme geoclue2 gnome3.gsettings_desktop_schemas
  ];

--- a/pkgs/desktops/gnome-3/3.24/core/gcr/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/gcr/default.nix
@ -5,8 +5,9 @@
 stdenv.mkDerivation rec {
  inherit (import ./src.nix fetchurl) name src;

+  nativeBuildInputs = [ pkgconfig ];
  buildInputs = [
-    pkgconfig intltool gnupg glib gobjectIntrospection libxslt
+    intltool gnupg glib gobjectIntrospection libxslt
    libgcrypt libtasn1 dbus_glib gtk pango gdk_pixbuf atk makeWrapper vala_0_32
  ];

--- a/pkgs/desktops/gnome-3/3.24/devtools/devhelp/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/devtools/devhelp/default.nix
@ -4,8 +4,9 @@
 stdenv.mkDerivation rec {
  inherit (import ./src.nix fetchurl) name src;

+  nativeBuildInputs = [ pkgconfig ];
  buildInputs = [
-    pkgconfig gtk3 wrapGAppsHook webkitgtk intltool gnome3.defaultIconTheme
+    gtk3 wrapGAppsHook webkitgtk intltool gnome3.defaultIconTheme
    gsettings_desktop_schemas
  ];

--- a/pkgs/desktops/gnome-3/3.24/games/five-or-more/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/games/five-or-more/default.nix
@ -4,8 +4,9 @@
 stdenv.mkDerivation rec {
  inherit (import ./src.nix fetchurl) name src;

+  nativeBuildInputs = [ pkgconfig ];
  buildInputs = [
-    pkgconfig gtk3 wrapGAppsHook librsvg intltool itstool libxml2
+    gtk3 wrapGAppsHook librsvg intltool itstool libxml2
    gnome3.defaultIconTheme
  ];

--- a/pkgs/desktops/gnome-3/3.24/games/four-in-a-row/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/games/four-in-a-row/default.nix
@ -4,8 +4,9 @@
 stdenv.mkDerivation rec {
  inherit (import ./src.nix fetchurl) name src;

+  nativeBuildInputs = [ pkgconfig ];
  buildInputs = [
-    pkgconfig gtk3 wrapGAppsHook intltool itstool libcanberra_gtk3 librsvg
+    gtk3 wrapGAppsHook intltool itstool libcanberra_gtk3 librsvg
    libxml2 gnome3.defaultIconTheme
  ];

--- a/pkgs/desktops/gnome-3/3.24/games/gnome-chess/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/games/gnome-chess/default.nix
@ -4,8 +4,9 @@
 stdenv.mkDerivation rec {
  inherit (import ./src.nix fetchurl) name src;

+  nativeBuildInputs = [ pkgconfig ];
  buildInputs = [
-    pkgconfig gtk3 wrapGAppsHook intltool itstool librsvg libxml2
+    gtk3 wrapGAppsHook intltool itstool librsvg libxml2
    gnome3.defaultIconTheme
  ];

--- a/pkgs/desktops/gnome-3/3.24/games/gnome-klotski/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/games/gnome-klotski/default.nix
@ -4,8 +4,9 @@
 stdenv.mkDerivation rec {
  inherit (import ./src.nix fetchurl) name src;

+  nativeBuildInputs = [ pkgconfig ];
  buildInputs = [
-    pkgconfig gtk3 wrapGAppsHook intltool itstool librsvg libxml2 libgee libgames-support
+    gtk3 wrapGAppsHook intltool itstool librsvg libxml2 libgee libgames-support
    gnome3.defaultIconTheme
  ];

--- a/pkgs/desktops/gnome-3/3.24/games/gnome-mahjongg/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/games/gnome-mahjongg/default.nix
@ -4,8 +4,9 @@
 stdenv.mkDerivation rec {
  inherit (import ./src.nix fetchurl) name src;

+  nativeBuildInputs = [ pkgconfig ];
  buildInputs = [
-    pkgconfig gtk3 wrapGAppsHook librsvg intltool itstool libxml2
+    gtk3 wrapGAppsHook librsvg intltool itstool libxml2
    gnome3.defaultIconTheme
  ];

--- a/pkgs/desktops/gnome-3/3.24/games/gnome-mines/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/games/gnome-mines/default.nix
@ -4,8 +4,9 @@
 stdenv.mkDerivation rec {
  inherit (import ./src.nix fetchurl) name src;

+  nativeBuildInputs = [ pkgconfig ];
  buildInputs = [
-    pkgconfig gtk3 wrapGAppsHook librsvg intltool itstool libxml2
+    gtk3 wrapGAppsHook librsvg intltool itstool libxml2
    gnome3.defaultIconTheme libgames-support libgee
  ];

--- a/pkgs/desktops/gnome-3/3.24/games/gnome-nibbles/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/games/gnome-nibbles/default.nix
@ -5,8 +5,9 @@
 stdenv.mkDerivation rec {
  inherit (import ./src.nix fetchurl) name src;

+  nativeBuildInputs = [ pkgconfig ];
  buildInputs = [
-    pkgconfig gtk3 wrapGAppsHook intltool itstool libxml2
+    gtk3 wrapGAppsHook intltool itstool libxml2
    librsvg libcanberra_gtk3 clutter_gtk gnome3.defaultIconTheme
    libgee libgames-support
  ];
--- a/pkgs/desktops/gnome-3/3.24/games/gnome-robots/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/games/gnome-robots/default.nix
@ -5,8 +5,9 @@
 stdenv.mkDerivation rec {
  inherit (import ./src.nix fetchurl) name src;

+  nativeBuildInputs = [ pkgconfig ];
  buildInputs = [
-    pkgconfig gtk3 wrapGAppsHook intltool itstool librsvg libcanberra_gtk3
+    gtk3 wrapGAppsHook intltool itstool librsvg libcanberra_gtk3
    libxml2 gnome3.defaultIconTheme libgames-support libgee
  ];

--- a/pkgs/desktops/gnome-3/3.24/games/gnome-taquin/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/games/gnome-taquin/default.nix
@ -4,8 +4,9 @@
 stdenv.mkDerivation rec {
  inherit (import ./src.nix fetchurl) name src;

+  nativeBuildInputs = [ pkgconfig ];
  buildInputs = [
-    pkgconfig gtk3 wrapGAppsHook librsvg libcanberra_gtk3
+    gtk3 wrapGAppsHook librsvg libcanberra_gtk3
    intltool itstool libxml2 gnome3.defaultIconTheme
  ];

--- a/pkgs/desktops/gnome-3/3.24/games/gnome-tetravex/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/games/gnome-tetravex/default.nix
@ -4,8 +4,9 @@
 stdenv.mkDerivation rec {
  inherit (import ./src.nix fetchurl) name src;

+  nativeBuildInputs = [ pkgconfig ];
  buildInputs = [
-    pkgconfig gtk3 wrapGAppsHook intltool itstool libxml2 gnome3.defaultIconTheme
+    gtk3 wrapGAppsHook intltool itstool libxml2 gnome3.defaultIconTheme
  ];

  meta = with stdenv.lib; {
--- a/pkgs/desktops/gnome-3/3.24/games/hitori/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/games/hitori/default.nix
@ -9,8 +9,9 @@ stdenv.mkDerivation rec {
    sha256 = "07pm3xl05jgb8x151k1j2ap57dmfvk2nkz9dmqnn5iywfigsysd1";
  };

+  nativeBuildInputs = [ pkgconfig ];
  buildInputs = [
-    pkgconfig gtk3 wrapGAppsHook intltool itstool libxml2
+    gtk3 wrapGAppsHook intltool itstool libxml2
    gnome3.defaultIconTheme
  ];

--- a/pkgs/desktops/gnome-3/3.24/misc/pomodoro/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/misc/pomodoro/default.nix
@ -16,8 +16,9 @@ stdenv.mkDerivation rec {

  configureScript = ''./autogen.sh'';

+  nativeBuildInputs = [ pkgconfig ];
  buildInputs = [
-    which intltool glib gobjectIntrospection pkgconfig libtool
+    which intltool glib gobjectIntrospection libtool
    makeWrapper dbus_glib libcanberra_gtk2 vala_0_32 gst_all_1.gstreamer
    gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
    gnome3.gsettings_desktop_schemas gnome3.gnome_desktop
--- a/pkgs/desktops/xfce/core/thunar-build.nix
+++ b/pkgs/desktops/xfce/core/thunar-build.nix
@ -21,8 +21,9 @@ stdenv.mkDerivation rec {
    sed -i -e 's|thunar_dialogs_show_insecure_program (parent, _(".*"), file, exec)|1|' thunar/thunar-file.c
  '';

+  nativeBuildInputs = [ pkgconfig ];
  buildInputs = [
-    pkgconfig intltool
+    intltool
    gtk dbus_glib libstartup_notification libnotify libexif pcre udev
    exo libxfce4util xfconf xfce4panel
  ];
--- a/Show More
+++ b/Show More