misc pkgs: Manual fixup pkgconfig nativeBuildInputs after sed

Importantly, this included regenerating pkgs/servers/x11/xorg, to
clobber the old sed.

pkgs/applications/audio/iannix/default.nix

@@ -11,8 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "184ydb9f1303v332k5k3f1ki7cb6nkxhh6ij0yn72v7dp7figrgj";
   };
 
-  nativeBuildInputs = [ qmake ];
+  nativeBuildInputs = [ pkgconfig qmake ];
-  nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ alsaLib qtbase qtscript ];
 
   qmakeFlags = [ "PREFIX=/" ];

pkgs/applications/editors/zile/default.nix

@@ -8,15 +8,15 @@ stdenv.mkDerivation rec {
     sha256 = "03mcg0bxkzprlsx8y6h22w924pzx4a9zr7zm3g11j8j3x9lz75f7";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkgconfig perl ]
-  buildInputs = [ ncurses boehmgc ];
-  nativeBuildInputs = [ perl ]
     # `help2man' wants to run Zile, which won't work when the
     # newly-produced binary can't be run at build-time.
     ++ stdenv.lib.optional
          (stdenv.hostPlatform == stdenv.buildPlatform)
          help2man;
 
+  buildInputs = [ ncurses boehmgc ];
+
   # Tests can't be run because most of them rely on the ability to
   # fiddle with the terminal.
   doCheck = false;

pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix

@@ -12,12 +12,10 @@ stdenv.mkDerivation rec {
 
   NIX_CFLAGS_COMPILE = "-I${dbus_glib.dev}/include/dbus-1.0 -I${dbus_libs.dev}/include/dbus-1.0";
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ makeWrapper pkgconfig ];
-  buildInputs = [ dbus_glib libxml2 sqlite telepathy_glib intltool makeWrapper
+  buildInputs = [ dbus_glib libxml2 sqlite telepathy_glib intltool libxslt 
                   gobjectIntrospection dbus_libs telepathy_glib.python (stdenv.lib.getLib gnome3.dconf) ];
 
-  nativeBuildInputs = [ libxslt ];
-
   configureFlags = "--enable-call";
 
   preFixup = ''

pkgs/applications/networking/linssid/default.nix

@@ -9,8 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "13d35rlcjncd8lx3khkgn9x8is2xjd5fp6ns5xsn3w6l4xj9b4gl";
   };
 
-  nativeBuildInputs = [ qmake ];
+  nativeBuildInputs = [ pkgconfig qmake ];
-  nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ qtbase qtsvg boost qwt6 ];
 
   patches = [ ./0001-unbundled-qwt.patch ];

pkgs/desktops/gnome-3/3.24/core/epiphany/default.nix

@@ -14,7 +14,6 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig file wrapGAppsHook ];
 
-  nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ gtk3 glib intltool libwnck3 libxml2 libxslt file
                   webkitgtk libsoup libsecret gnome_desktop libnotify libtool
                   sqlite isocodes nss itstool p11_kit nspr icu gnome3.yelp_tools

pkgs/development/interpreters/erlang/generic-builder.nix

@@ -47,10 +47,9 @@ in stdenv.mkDerivation ({
 
   inherit src version;
 
-  nativeBuildInputs = [ autoreconfHook makeWrapper perl ];
+  nativeBuildInputs = [ autoreconfHook makeWrapper perl gnum4 libxslt libxml2 ];
 
-  nativeBuildInputs = [ autoreconfHook ];
+  buildInputs = [ ncurses openssl ]
-  buildInputs = [ gnum4 ncurses openssl libxslt libxml2 ]
     ++ optionals wxSupport wxPackages2
     ++ optionals odbcSupport odbcPackages
     ++ optionals javacSupport javacPackages

pkgs/development/interpreters/pixie/default.nix

@@ -32,9 +32,8 @@ let
   build = {flags, target}: stdenv.mkDerivation rec {
     name = "pixie-${version}";
     version = "0-r${commit-count}-${variant}";
-    nativeBuildInputs = libs;
+    nativeBuildInputs = [ makeWrapper pkgconfig ];
-  nativeBuildInputs = [ pkgconfig ];
+    buildInputs = libs;
-    buildInputs = [ makeWrapper ];
     PYTHON = if buildWithPypy
       then "${pypy}/pypy-c/.pypy-c-wrapped"
       else "${python2.interpreter}";

pkgs/development/interpreters/spidermonkey/1.8.5.nix

@@ -11,9 +11,8 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ nspr ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkgconfig ] ++ lib.optional stdenv.isArm autoconf213;
   buildInputs = [ perl python2 zip ];
-  nativeBuildInputs = if stdenv.isArm then [ autoconf213 ] else [];
 
   postUnpack = "sourceRoot=\${sourceRoot}/js/src";
 

pkgs/development/libraries/directfb/default.nix

@@ -16,9 +16,8 @@ stdenv.mkDerivation {
     inherit (s) url sha256;
   };
 
-  nativeBuildInputs = [ perl ];
+  nativeBuildInputs = [ perl pkgconfig ];
 
-  nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ zlib libjpeg freetype giflib libpng ]
     ++ stdenv.lib.optional enableSDL SDL
     ++ stdenv.lib.optionals enableX11 (with xorg; [

pkgs/development/libraries/exosip/default.nix

@@ -9,7 +9,6 @@ stdenv.mkDerivation rec {
     sha256 = "17cna8kpc8nk1si419vgr6r42k2lda0rdk50vlxrw8rzg0xp2xrw";
   };
  
-  nativeBuildInputs = [ pkgconfig ];
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ libosip openssl ];
       

pkgs/development/libraries/fflas-ffpack/1.nix

@@ -7,9 +7,8 @@ stdenv.mkDerivation rec {
     url = "http://linalg.org/fflas-ffpack-${version}.tar.gz";
     sha256 = "02fr675278c65hfiy1chb903j4ix9i8yni1xc2g5nmsjcaf9vra9";
   };
-  nativeBuildInputs = [ autoreconfHook ];
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
   buildInputs = [ givaro_3_7 openblas gmpxx];
-  nativeBuildInputs = [pkgconfig];
   configureFlags = "--with-blas=-lopenblas --with-gmp=${gmpxx.dev} --with-givaro=${givaro_3_7}";
   meta = {
     inherit version;

pkgs/development/libraries/fflas-ffpack/default.nix

@@ -9,9 +9,8 @@ stdenv.mkDerivation rec {
     rev = "v${version}";
     sha256 = "0k1f4pb7azrm6ajncvg7vni7ixfmn6fssd5ld4xddbi6jqbsf9rd";
   };
-  nativeBuildInputs = [ autoreconfHook ];
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
   buildInputs = [ givaro (liblapack.override {shared = true;}) openblas];
-  nativeBuildInputs = [pkgconfig];
   configureFlags = "--with-blas-libs=-lopenblas --with-lapack-libs=-llapack";
   meta = {
     inherit version;

pkgs/development/libraries/java/jzmq/default.nix

@@ -11,8 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "1wlzs604mgmqmrgpk4pljx2nrlxzdfi3r8k59qlm90fx8qkqkc63";
   };
 
-  nativeBuildInputs = [ autoreconfHook ];
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
-  nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ zeromq3 jdk ];
 
   preConfigure = ''

pkgs/development/libraries/libtorrent-rasterbar/generic.nix

@@ -15,9 +15,7 @@ stdenv.mkDerivation rec {
     inherit sha256;
   };
 
-  nativeBuildInputs = [automake autoconf libtool ];
+  nativeBuildInputs = [ automake autoconf libtool pkgconfig ];
-
-  nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ boost openssl zlib python libiconv geoip ];
 
   preConfigure = "./autotool.sh";

pkgs/development/libraries/mediastreamer/msopenh264.nix

@@ -12,9 +12,8 @@ stdenv.mkDerivation rec {
     sha256 = "001km4xy1ifwbg1c19ncc75h867fzfcxy9pxvl4pxqb64169xc1k";
   };
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook cmake pkgconfig ];
   buildInputs = [ mediastreamer openh264 ];
-  nativeBuildInputs = [ cmake ];
 
   meta = with stdenv.lib; {
     description = "H.264 encoder/decoder plugin for mediastreamer2";

pkgs/development/libraries/shibboleth-sp/default.nix

@@ -10,9 +10,8 @@ stdenv.mkDerivation rec {
     sha256 = "1b5r4nd098lnjwr2g13f04ycqv5fvbrhpwg6fsdk8xy9cigvfzxj";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
   buildInputs = [ boost fcgi openssl opensaml-cpp log4shib xercesc xml-security-c xml-tooling-c ];
-  nativeBuildInputs = [ autoreconfHook ];
 
   configureFlags = [
     "--without-apxs"

pkgs/development/libraries/vulkan-loader/default.nix

@@ -16,8 +16,7 @@ stdenv.mkDerivation rec {
   name = "vulkan-loader-${version}";
   inherit version src;
 
-  nativeBuildInputs = [ makeWrapper ];
+  nativeBuildInputs = [ makeWrapper pkgconfig ];
-  nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ cmake git python3 python3Packages.lxml
                   glslang spirv-tools x11 libxcb libXrandr libXext wayland
                 ];

pkgs/development/python-modules/Cython/default.nix

@@ -30,11 +30,12 @@ buildPythonPackage rec {
       tests/run/cpdef_enums.pyx
   '';
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [
-  buildInputs = [ glibcLocales gdb ];
+    pkgconfig
     # For testing
-  nativeBuildInputs = [ numpy ncurses ];
+    numpy ncurses
-
+  ];
+  buildInputs = [ glibcLocales gdb ];
   LC_ALL = "en_US.UTF-8";
 
   # cython's testsuite is not working very well with libc++

pkgs/development/ruby-modules/gem-config/default.nix

@@ -39,8 +39,10 @@ let
 in
 
 {
+  atk = attrs: {
     nativeBuildInputs = [ pkgconfig ];
-  atk = attrs: { buildInputs = [ gtk2 pcre ]; };
+    buildInputs = [ gtk2 pcre ];
+  };
 
   bundler = attrs:
     let
@@ -91,13 +93,17 @@ in
     buildInputs = [ gpgme ];
   };
 
+  gio2 = attrs: {
     nativeBuildInputs = [ pkgconfig ];
-  gio2 = attrs: { buildInputs = [ gtk2 pcre ]; };
+    buildInputs = [ gtk2 pcre ];
+  };
 
   gitlab-markup = attrs: { meta.priority = 1; };
 
+  glib2 = attrs: {
     nativeBuildInputs = [ pkgconfig ];
-  glib2 = attrs: { buildInputs = [ gtk2 pcre ]; };
+    buildInputs = [ gtk2 pcre ];
+  };
 
   gtk2 = attrs: {
     nativeBuildInputs = [ pkgconfig ];

pkgs/os-specific/linux/kernel/perf.nix

@@ -23,8 +23,7 @@ stdenv.mkDerivation {
   # perf refers both to newt and slang
   # binutils is required for libbfd.
   nativeBuildInputs = [ asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt
-      flex bison libiberty libaudit makeWrapper ];
+      flex bison libiberty libaudit makeWrapper pkgconfig ];
-  nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ elfutils python perl newt slang libunwind binutils zlib ] ++
     stdenv.lib.optional withGtk gtk2;
 

pkgs/servers/x11/xorg/default.nix

@@ -27,6 +27,7 @@ let
       sha256 = "1zi4p07mp6jmk030p4gmglwxcwp0lzs5mi31y1b4rp8lsqxdxizw";
     };
     nativeBuildInputs = [ pkgconfig ];
+    buildInputs = [ ];
     meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
@@ -62,6 +63,7 @@ let
       sha256 = "07hvfm84scz8zjw14riiln2v4w03jlhp756ypwhq27g48jmic8a6";
     };
     nativeBuildInputs = [ pkgconfig ];
+    buildInputs = [ ];
     meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
@@ -73,6 +75,7 @@ let
       sha256 = "1z0crmf669hirw4s7972mmp8xig80kfndja9h559haqbpvq5k4q4";
     };
     nativeBuildInputs = [ pkgconfig ];
+    buildInputs = [ ];
     meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
@@ -84,6 +87,7 @@ let
       sha256 = "0nzwr5pv9hg7c21n995pdiv0zqhs91yz3r8rn3aska4ykcp12z2w";
     };
     nativeBuildInputs = [ pkgconfig ];
+    buildInputs = [ ];
     meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
@@ -95,6 +99,7 @@ let
       sha256 = "02b5x9dkgajizm8dqyx2w6hmqx3v25l67mgf35nj6sz0lgk52877";
     };
     nativeBuildInputs = [ pkgconfig ];
+    buildInputs = [ ];
     meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
@@ -106,6 +111,7 @@ let
       sha256 = "015az1vfdqmil1yay5nlsmpf6cf7vcbpslxjb72cfkzlvrv59dgr";
     };
     nativeBuildInputs = [ pkgconfig ];
+    buildInputs = [ ];
     meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
@@ -117,6 +123,7 @@ let
       sha256 = "0x609xvnl8jky5m8jdklw4nymx3irkv32w99dfd8nl800bblkgh1";
     };
     nativeBuildInputs = [ pkgconfig ];
+    buildInputs = [ ];
     meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
@@ -128,6 +135,7 @@ let
       sha256 = "0ffmaw80vmfwdgvdkp6495xgsqszb6s0iira5j0j6pd4i0lk3mnf";
     };
     nativeBuildInputs = [ pkgconfig ];
+    buildInputs = [ ];
     meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
@@ -211,6 +219,7 @@ let
       sha256 = "16ic8wfwwr3jicaml7b5a0sk6plcgc1kg84w02881yhwmqm3nicb";
     };
     nativeBuildInputs = [ pkgconfig ];
+    buildInputs = [ ];
     meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
@@ -534,6 +543,7 @@ let
       sha256 = "1f2sdsd74y34nnaf4m1zlcbhyv8xb6irnisc99f84c4ivnq4d415";
     };
     nativeBuildInputs = [ pkgconfig ];
+    buildInputs = [ ];
     meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
@@ -557,6 +567,7 @@ let
       sha256 = "08drjb6cf84pf5ysghjpb4i7xkd2p86k3wl2a0jxs1jif6qbszma";
     };
     nativeBuildInputs = [ pkgconfig ];
+    buildInputs = [ ];
     meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
@@ -592,6 +603,7 @@ let
       sha256 = "1r1fpy5ni8chbgx7j5sz0008fpb6vbazpy1nifgdhgijyzqxqxdj";
     };
     nativeBuildInputs = [ pkgconfig ];
+    buildInputs = [ ];
     meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
@@ -603,6 +615,7 @@ let
       sha256 = "0h5ykmcddwid5qj6sbrszgkcypwn3mslvswxpgy2n2iixnyr9amd";
     };
     nativeBuildInputs = [ pkgconfig ];
+    buildInputs = [ ];
     meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
@@ -638,6 +651,7 @@ let
       sha256 = "07gk7v006zqn3dcfh16l06gnccy7xnqywf3vl9c209ikazsnlfl9";
     };
     nativeBuildInputs = [ pkgconfig ];
+    buildInputs = [ ];
     meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
@@ -649,6 +663,7 @@ let
       sha256 = "0mxqj1pzhjpz9495vrjnpi10kv2n1s4vs7di0sh3yvipfq5j30pq";
     };
     nativeBuildInputs = [ pkgconfig ];
+    buildInputs = [ ];
     meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
@@ -1104,6 +1119,7 @@ let
       sha256 = "0cz7s9w8lqgzinicd4g36rjg08zhsbyngh0w68c3np8nlc8mkl74";
     };
     nativeBuildInputs = [ pkgconfig ];
+    buildInputs = [ ];
     meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
@@ -1187,6 +1203,7 @@ let
       sha256 = "0c3563kw9fg15dpgx4dwvl12qz6sdqdns1pxa574hc7i5m42mman";
     };
     nativeBuildInputs = [ pkgconfig ];
+    buildInputs = [ ];
     meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
@@ -1210,6 +1227,7 @@ let
       sha256 = "1f96dlgfwhsd0834z8ydjzjnb0cwha5r6lxgia4say4zhsl276zn";
     };
     nativeBuildInputs = [ pkgconfig ];
+    buildInputs = [ ];
     meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
@@ -1233,6 +1251,7 @@ let
       sha256 = "0s4496z61y5q45q20gldwpf788b9nsa8hb13gnck1mwwwwrmarsc";
     };
     nativeBuildInputs = [ pkgconfig ];
+    buildInputs = [ ];
     meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
@@ -1244,6 +1263,7 @@ let
       sha256 = "0w3kgr1zabwf79bpc28dcnj0fpni6r53rpi82ngjbalj5s6m8xx7";
     };
     nativeBuildInputs = [ pkgconfig ];
+    buildInputs = [ ];
     meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
@@ -1255,6 +1275,7 @@ let
       sha256 = "0dr5xw6s0qmqg0q5pdkb4jkdhaja0vbfqla79qh5j1xjj9dmlwq6";
     };
     nativeBuildInputs = [ pkgconfig ];
+    buildInputs = [ ];
     meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
@@ -1266,6 +1287,7 @@ let
       sha256 = "0638iyfiiyjw1hg3139pai0j6m65gkskrvd9684zgc6ydcx00riw";
     };
     nativeBuildInputs = [ pkgconfig ];
+    buildInputs = [ ];
     meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
@@ -1277,6 +1299,7 @@ let
       sha256 = "0rfdbfwd35d761xkfifcscx56q0n56043ixlmv70r4v4l66hmdwb";
     };
     nativeBuildInputs = [ pkgconfig ];
+    buildInputs = [ ];
     meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
@@ -1336,6 +1359,7 @@ let
       sha256 = "19h6wflpmh7xxqr6lk5z8pds6r9r0dn7ijbvaacymx2q0m05km0q";
     };
     nativeBuildInputs = [ pkgconfig ];
+    buildInputs = [ ];
     meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
@@ -1347,6 +1371,7 @@ let
       sha256 = "00m7rh3pwmsld4d5fpii3xfk5ciqn17kkk38gfpzrrh8zn4ki067";
     };
     nativeBuildInputs = [ pkgconfig ];
+    buildInputs = [ ];
     meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
@@ -1358,6 +1383,7 @@ let
       sha256 = "0syjxgy4m8l94qrm03nvn5k6bkxc8knnlld1gbllym97nvnv0ny0";
     };
     nativeBuildInputs = [ pkgconfig ];
+    buildInputs = [ ];
     meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
@@ -1405,6 +1431,7 @@ let
       sha256 = "178ym90kwidia6nas4qr5n5yqh698vv8r02js0r4vg3b6lsb0w9n";
     };
     nativeBuildInputs = [ pkgconfig ];
+    buildInputs = [ ];
     meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
@@ -1524,6 +1551,7 @@ let
       sha256 = "1pyjv45wivnwap2wvsbrzdvjc5ql8bakkbkrvcv6q9bjjf33ccmi";
     };
     nativeBuildInputs = [ pkgconfig ];
+    buildInputs = [ ];
     meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
@@ -1631,6 +1659,7 @@ let
       sha256 = "1c2vma9gqgc2v06rfxdiqgwhxmzk2cbmknwf1ng3m76vr0xb5x7k";
     };
     nativeBuildInputs = [ pkgconfig ];
+    buildInputs = [ ];
     meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
@@ -1654,6 +1683,7 @@ let
       sha256 = "0j0n7sj5xfjpmmgx6n5x556rw21hdd18fwmavp95wps7qki214ms";
     };
     nativeBuildInputs = [ pkgconfig ];
+    buildInputs = [ ];
     meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
@@ -1665,6 +1695,7 @@ let
       sha256 = "0l4hx48207mx0hp09026r6gy9nl3asbq0c75hri19wp1118zcpmc";
     };
     nativeBuildInputs = [ pkgconfig ];
+    buildInputs = [ ];
     meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
@@ -1676,6 +1707,7 @@ let
       sha256 = "07v69m0g2dfzb653jni4x656jlr7l84c1k39j8qc8vfb45r8sjww";
     };
     nativeBuildInputs = [ pkgconfig ];
+    buildInputs = [ ];
     meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
@@ -1783,6 +1815,7 @@ let
       sha256 = "15dhcdpv61fyj6rhzrhnwri9hlw8rjfy05z1vik118lc99mfrf25";
     };
     nativeBuildInputs = [ pkgconfig ];
+    buildInputs = [ ];
     meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
@@ -1943,11 +1976,11 @@ let
   }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
 
   xf86videointel = (mkDerivation "xf86videointel" {
-    name = "xf86-video-intel-2017-04-18";
+    name = "xf86-video-intel-2.99.917";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://cgit.freedesktop.org/xorg/driver/xf86-video-intel/snapshot/c72bb27a3a68ecc616ce2dc8e9a1d20354504562.tar.gz;
+      url = mirror://xorg/individual/driver/xf86-video-intel-2.99.917.tar.bz2;
-      sha256 = "1awxbig135nmq7qa8jzggqr4q32k6ngnal2lckrdkg7zqi40zdv8";
+      sha256 = "1jb7jspmzidfixbc0gghyjmnmpqv85i7pi13l4h2hn2ml3p83dq0";
     };
     nativeBuildInputs = [ pkgconfig ];
     buildInputs = [ dri2proto dri3proto fontsproto libdrm libpng udev libpciaccess presentproto randrproto renderproto libX11 xcbutil libxcb libXcursor libXdamage libXext xextproto xf86driproto libXfixes xorgserver xproto libXrandr libXrender libxshmfence libXtst libXvMC ];
@@ -2286,6 +2319,7 @@ let
       sha256 = "0w47d7gfa8zizh2bshdr2rffvbr4jqjv019mdgyh6cmplyd4kna5";
     };
     nativeBuildInputs = [ pkgconfig ];
+    buildInputs = [ ];
     meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
@@ -2345,6 +2379,7 @@ let
       sha256 = "0ns8abd27x7gbp4r44z3wc5k9zqxxj8zjnazqpcyr4n17nxp8xcp";
     };
     nativeBuildInputs = [ pkgconfig ];
+    buildInputs = [ ];
     meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
@@ -2524,6 +2559,7 @@ let
       sha256 = "0kckng0zs1viz0nr84rdl6dswgip7ndn4pnh5nfwnviwpsfmmksd";
     };
     nativeBuildInputs = [ pkgconfig ];
+    buildInputs = [ ];
     meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
@@ -2535,6 +2571,7 @@ let
       sha256 = "0jrc4jmb4raqawx0j9jmhgasr0k6sxv0bm2hrxjh9hb26iy6gf14";
     };
     nativeBuildInputs = [ pkgconfig ];
+    buildInputs = [ ];
     meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
@@ -2558,6 +2595,7 @@ let
       sha256 = "0k5pffyi5bx8dmfn033cyhgd3gf6viqj3x769fqixifwhbgy2777";
     };
     nativeBuildInputs = [ pkgconfig ];
+    buildInputs = [ ];
     meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
@@ -2593,6 +2631,7 @@ let
       sha256 = "0ivpxz0rx2a7nahkpkhfgymz7j0pwzaqvyqpdgw9afmxl1yp9yf6";
     };
     nativeBuildInputs = [ pkgconfig ];
+    buildInputs = [ ];
     meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
@@ -2664,6 +2703,7 @@ let
       sha256 = "00c3ph17acnsch3gbdmx33b9ifjnl5w7vx8hrmic1r1cjcv3pgdd";
     };
     nativeBuildInputs = [ pkgconfig ];
+    buildInputs = [ ];
     meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 

pkgs/servers/x11/xorg/overrides.nix

@@ -71,13 +71,13 @@ in
   };
 
   libxcb = attrs : attrs // {
-    nativeBuildInputs = [ args.python ];
+    nativeBuildInputs = attrs.nativeBuildInputs ++ [ args.python ];
     configureFlags = "--enable-xkb --enable-xinput";
     outputs = [ "out" "dev" "man" "doc" ];
   };
 
   xcbproto = attrs : attrs // {
-    nativeBuildInputs = [ args.python ];
+    nativeBuildInputs = attrs.nativeBuildInputs ++ [ args.python ];
   };
 
   libX11 = attrs: attrs // {
@@ -541,7 +541,7 @@ in
   };
 
   twm = attrs: attrs // {
-    nativeBuildInputs = [args.bison args.flex];
+    nativeBuildInputs = attrs.nativeBuildInputs ++ [args.bison args.flex];
   };
 
   xcursorthemes = attrs: attrs // {
@@ -568,7 +568,7 @@ in
 
   xf86videointel = attrs: attrs // {
     buildInputs = attrs.buildInputs ++ [xorg.libXfixes xorg.libXScrnSaver xorg.pixman];
-    nativeBuildInputs = [args.autoreconfHook xorg.utilmacros];
+    nativeBuildInputs = attrs.nativeBuildInputs ++ [args.autoreconfHook xorg.utilmacros];
     configureFlags = "--with-default-dri=3 --enable-tools";
   };
 

pkgs/tools/misc/colord/default.nix

@@ -10,7 +10,6 @@ stdenv.mkDerivation rec {
     url = "http://www.freedesktop.org/software/colord/releases/${name}.tar.xz";
     sha256 = "0flcsr148xshjbff030pgyk9ar25an901m9q1pjgjdvaq5j1h96m";
   };
-   nativeBuildInputs = [ autoreconfHook intltool ];
 
   enableParallelBuilding = true;
 
@@ -34,7 +33,8 @@ stdenv.mkDerivation rec {
     sed -e "s|if test -w .*;|if false;|" -i src/Makefile.{am,in}
   '';
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook intltool pkgconfig ];
+
   buildInputs = [ glib polkit gusb libusb1 lcms2 sqlite systemd dbus gobjectIntrospection
                   bash-completion argyllcms libgudev sane-backends ];
 

pkgs/tools/networking/libreswan/default.nix

@@ -24,8 +24,7 @@ stdenv.mkDerivation {
     sha256 = "0zginnakxw7m79zrdvfdvliaiyg78zgqfqkks9z5d1rjj5w13xig";
   };
 
-  nativeBuildInputs = [ makeWrapper ];
+  nativeBuildInputs = [ makeWrapper pkgconfig ];
-  nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ bash iproute iptables systemd coreutils gnused gawk gmp unbound bison flex pam libevent
                   libcap_ng curl nspr nss python ]
                 ++ optional docs xmlto;

pkgs/top-level/emscripten-packages.nix

@@ -13,9 +13,8 @@ with pkgs; rec {
     pythonSupport = false;
   }).overrideDerivation
     (old: { 
-  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+      nativeBuildInputs = old.nativeBuildInputs ++ [ autoreconfHook pkgconfig ];
       buildInputs = old.buildInputs ++ [ zlib nodejs ];
-      nativeBuildInputs = old.nativeBuildInputs ++ [ zlib pkgconfig ];
       # just override it with nothing so it does not fail
       autoreconfPhase = "echo autoreconfPhase not used..."; 
       checkPhase = ''

pkgs/top-level/perl-packages.nix

@@ -9895,9 +9895,8 @@ let self = _self // overrides; _self = with self; {
     # Build.PL in this package uses which to find pkg-config -- make it use path instead
     patchPhase = ''sed -ie 's/`which pkg-config`/"pkg-config"/' Build.PL'';
     doCheck = false; # The main test performs network access
+    nativeBuildInputs = [ pkgs.pkgconfig ];
     #buildInputs = [ TestMore TestPod ];
-  nativeBuildInputs = [ pkgconfig ];
-    buildInputs = [ pkgs. ];
     propagatedBuildInputs = [ pkgs.libdiscid ];
   };
 
@@ -12787,8 +12786,8 @@ let self = _self // overrides; _self = with self; {
       sha256 = "18v8x0514in0zpvq1rv78hmvhpij1xjh5xn0wa6wmg2swky54sp4";
     };
     propagatedBuildInputs = [XMLXPath];
-  nativeBuildInputs = [ pkgconfig ];
+    nativeBuildInputs = [ pkgs.pkgconfig ];
-    buildInputs = [TestPodCoverage TimeHiRes TestPod pkgs. pkgs.libvirt];
+    buildInputs = [TestPodCoverage TimeHiRes TestPod pkgs.libvirt];
     meta = {
       platforms = stdenv.lib.platforms.linux;
     };

pkgs/top-level/php-packages.nix

@@ -91,7 +91,7 @@ let
       "--with-libmemcached-dir=${pkgs.libmemcached}"
     ];
 
-  nativeBuildInputs = [ pkgconfig ];
+    nativeBuildInputs = [ pkgs.pkgconfig ];
     buildInputs = with pkgs; [ cyrus_sasl zlib ];
   };
 
@@ -110,7 +110,7 @@ let
       "--with-libmemcached-dir=${pkgs.libmemcached}"
     ];
 
-  nativeBuildInputs = [ pkgconfig ];
+    nativeBuildInputs = [ pkgs.pkgconfig ];
     buildInputs = with pkgs; [ cyrus_sasl zlib ];
   };
 
@@ -164,9 +164,7 @@ let
       "--with-yaml=${pkgs.libyaml}"
     ];
 
-    buildInputs = [
+    nativeBuildInputs = [ pkgs.pkgconfig ];
-      pkgs.pkgconfig
-    ];
   };
 
   yaml20 = assert isPhp7; buildPecl {
@@ -178,9 +176,7 @@ let
       "--with-yaml=${pkgs.libyaml}"
     ];
 
-    buildInputs = [
+    nativeBuildInputs = [ pkgs.pkgconfig ];
-      pkgs.pkgconfig
-    ];
   };
 
   # Since PHP 5.5 OPcache is integrated in the core and has to be enabled via --enable-opcache during compilation.
@@ -199,8 +195,7 @@ let
       "--with-zmq=${pkgs.zeromq}"
     ];
 
-  nativeBuildInputs = [ pkgconfig ];
+    nativeBuildInputs = [ pkgs.pkgconfig ];
-    buildInputs = [ pkgs. ];
   };
 
   # No support for PHP 7 and probably never will be

pkgs/top-level/python-packages.nix

@@ -7166,8 +7166,8 @@ in {
     };
 
     NIX_CFLAGS_COMPILE="-I${pkgs.poppler.dev}/include/poppler/";
-  nativeBuildInputs = [ pkgconfig ];
+    nativeBuildInputs = [ pkgs.pkgconfig ];
-    buildInputs = [ pkgs. pkgs.poppler.dev ];
+    buildInputs = [ pkgs.poppler.dev ];
     propagatedBuildInputs = with self; [ pycairo pygobject2 ];
 
     patches = [
@@ -9448,8 +9448,8 @@ in {
       sha256 = "06rmp1ap6flh64m81j0n3a357ij2vj9zwcvvw0p31y6hz1id9shi";
     };
 
-  nativeBuildInputs = [ pkgconfig ];
+    nativeBuildInputs = [ pkgs.pkgconfig ];
-    buildInputs = with self; [ pkgs. pkgs.fuse ];
+    buildInputs = with self; [ pkgs.fuse ];
 
     meta = {
       description = "Python bindings for FUSE";
@@ -11193,8 +11193,8 @@ in {
       sha256 = "1li7q04ljrvwharw4fblcbfhvk6s0l3lnv8yqb4c22lcgbkiqlps";
     };
 
-  nativeBuildInputs = [ pkgconfig ];
+    nativeBuildInputs = [ pkgs.pkgconfig ];
-    buildInputs = with self; [ pytest pkgs. pkgs.fuse pkgs.attr pkgs.which ];
+    buildInputs = with self; [ pytest pkgs.fuse pkgs.attr pkgs.which ];
 
     propagatedBuildInputs = with self; [ contextlib2 ];
 
@@ -13138,8 +13138,8 @@ in {
         configure
     '';
 
-  nativeBuildInputs = [ pkgconfig ];
+    nativeBuildInputs = [ pkgs.pkgconfig ];
-    buildInputs = with self; [ python pkgs. pkgs.libnotify pygobject2 pygtk pkgs.glib pkgs.gtk2 pkgs.dbus_glib ];
+    buildInputs = with self; [ python pkgs.libnotify pygobject2 pygtk pkgs.glib pkgs.gtk2 pkgs.dbus_glib ];
 
     postInstall = "cd $out/lib/python*/site-packages && ln -s gtk-*/pynotify .";
 
@@ -16424,8 +16424,8 @@ in {
       patchShebangs .
     '';
 
-  nativeBuildInputs = [ pkgconfig ];
+    nativeBuildInputs = [ pkgs.pkgconfig ];
-    buildInputs = [ self.setuptools self.nose pkgs. pkgs.swig pkgs.libcdio ]
+    buildInputs = [ self.setuptools self.nose pkgs.swig pkgs.libcdio ]
       ++ stdenv.lib.optional stdenv.isDarwin pkgs.libiconv;
 
     patches = [ ../development/python-modules/pycdio/add-cdtext-toc.patch ];
@@ -17125,8 +17125,7 @@ in {
       PATH="${pkgs.parted}/sbin:$PATH"
     '';
 
-  nativeBuildInputs = [ pkgconfig ];
+    nativeBuildInputs = [ pkgs.pkgconfig ];
-    buildInputs = with self; [ pkgs. ];
 
     propagatedBuildInputs = with self; [ pkgs.parted ];
 
@@ -20290,8 +20289,8 @@ in {
       sha256 = "0zrjxvzxqm4bz2jcy8sras8jircgbs6dkrw8j3nc6jhvzlikwwxl";
     };
 
-  nativeBuildInputs = [ pkgconfig ];
+    nativeBuildInputs = [ pkgs.pkgconfig ];
-    buildInputs = [ pkgs. self.pytest_28 self.pytestrunner ];
+    buildInputs = [ self.pytest_28 self.pytestrunner ];
     propagatedBuildInputs = [ self.cffi pkgs.secp256k1 ];
 
     # Tests are not included in archive
@@ -20373,9 +20372,9 @@ in {
       sha256 = "1q35kgz151rr99240jq55rs39y741m8shh9yihl3x95rkjxchji4";
     };
 
-    propagatedBuildInputs = with self; [ cython pkgs.openssl dns dateutil xcaplib msrplib lxml python-otr ];
+    nativeBuildInputs = [ pkgs.pkgconfig ];
-  nativeBuildInputs = [ pkgconfig ];
     buildInputs = with pkgs; [ alsaLib ffmpeg libv4l sqlite libvpx ];
+    propagatedBuildInputs = with self; [ cython pkgs.openssl dns dateutil xcaplib msrplib lxml python-otr ];
   };
 
 
@@ -20964,8 +20963,8 @@ in {
     src = pkgs.subunit.src;
 
     propagatedBuildInputs = with self; [ testtools testscenarios ];
-  nativeBuildInputs = [ pkgconfig ];
+    nativeBuildInputs = [ pkgs.pkgconfig ];
-    buildInputs = [ pkgs. pkgs.check pkgs.cppunit ];
+    buildInputs = [ pkgs.check pkgs.cppunit ];
 
     patchPhase = ''
       sed -i 's/version=VERSION/version="${pkgs.subunit.version}"/' setup.py
@@ -24109,8 +24108,8 @@ EOF
       sha256 = "1l0s9cx38qb6x5xj32r531xap11m93c3gag30idj8fzkn74cpfgc";
     };
 
-  nativeBuildInputs = [ pkgconfig ];
+    nativeBuildInputs = [ pkgs.pkgconfig ];
-    buildInputs = with self; [ python pkgs. pkgs.libvirt lxml ];
+    buildInputs = with self; [ python pkgs.libvirt lxml ];
 
     buildPhase = "${python.interpreter} setup.py build";
 
@@ -24249,8 +24248,8 @@ EOF
     preBuild = "${python}/bin/${python.executable} setup.py build_ext";
     installPhase= "${python}/bin/${python.executable} setup.py install --prefix=$out";
 
-  nativeBuildInputs = [ pkgconfig ];
+    nativeBuildInputs = [ pkgs.pkgconfig ];
-    buildInputs = with self; [ pkgs. pkgs.enlightenment.efl ];
+    buildInputs = with self; [ pkgs.enlightenment.efl ];
     doCheck = false;
 
     meta = {