treewide: cmake buildInputs to nativeBuildInputs, minor cleanups

pkgs/applications/audio/artyFX/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub , cairomm, cmake, libjack2, libpthreadstubs, libXdmcp, libxshmfence, libsndfile, lv2, ntk, pkgconfig }:
+{ stdenv, fetchFromGitHub , cairomm, cmake, libjack2, libpthreadstubs, libXdmcp, libxshmfence, libsndfile, lv2, ntk, pkg-config }:
 
 stdenv.mkDerivation rec {
   pname = "artyFX";
@@ -12,8 +12,8 @@ stdenv.mkDerivation rec {
     sha256 = "0wwg8ivnpyy0235bapjy4g0ij85zq355jwi6c1nkrac79p4z9ail";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ cmake pkg-config ];
-  buildInputs = [ cairomm cmake libjack2 libpthreadstubs libXdmcp libxshmfence libsndfile lv2 ntk   ];
+  buildInputs = [ cairomm libjack2 libpthreadstubs libXdmcp libxshmfence libsndfile lv2 ntk ];
 
   meta = with stdenv.lib; {
     homepage = "http://openavproductions.com/artyfx/";

pkgs/applications/audio/eq10q/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, cmake, fftw, gtkmm2, libxcb, lv2, pkgconfig
+{ stdenv, fetchurl, fetchpatch, cmake, fftw, gtkmm2, libxcb, lv2, pkg-config
 , xorg }:
 stdenv.mkDerivation rec {
   pname = "eq10q";
@@ -8,8 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "16mhcav8gwkp29k9ki4dlkajlcgh1i2wvldabxb046d37dq4qzrk";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ cmake pkg-config ];
-  buildInputs = [ cmake fftw gtkmm2 libxcb lv2 xorg.libpthreadstubs xorg.libXdmcp xorg.libxshmfence ];
+  buildInputs = [ fftw gtkmm2 libxcb lv2 xorg.libpthreadstubs xorg.libXdmcp xorg.libxshmfence ];
 
   patches = [
     (fetchpatch {

pkgs/applications/audio/eteroj.lv2/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, libuv, lv2 }:
+{ stdenv, fetchFromGitHub, cmake, pkg-config, libuv, lv2 }:
 
 stdenv.mkDerivation rec {
   pname = "eteroj.lv2";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ libuv lv2 ];
-  nativeBuildInputs = [ cmake pkgconfig ];
+  nativeBuildInputs = [ cmake pkg-config ];
 
   meta = with stdenv.lib; {
     description = "OSC injection/ejection from/to UDP/TCP/Serial for LV2";

pkgs/applications/audio/game-music-emu/default.nix

@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "07857vdkak306d9s5g6fhmjyxk7vijzjhkmqb15s7ihfxx9lx8xb";
   };
 
-  buildInputs = [ cmake ];
+  nativeBuildInputs = [ cmake ];
 
   meta = with stdenv.lib; {
     homepage = "https://bitbucket.org/mpyne/game-music-emu/wiki/Home";

pkgs/applications/audio/kid3/default.nix

@@ -1,5 +1,5 @@
 { stdenv, fetchurl
-, pkgconfig, cmake, python3, ffmpeg_3, phonon, automoc4
+, pkg-config, cmake, python3, ffmpeg_3, phonon, automoc4
 , chromaprint, docbook_xml_dtd_45, docbook_xsl, libxslt
 , id3lib, taglib, mp4v2, flac, libogg, libvorbis
 , zlib, readline , qtbase, qttools, qtmultimedia, qtquickcontrols
@@ -15,12 +15,11 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-WYuEOqMu2VMOv6mkVCRXnmInFER/DWfPNqYuaTJ3vAc=";
   };
 
-  nativeBuildInputs = [ wrapQtAppsHook ];
+  nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];
-  buildInputs = [
+  buildInputs = [ python3 ffmpeg_3 phonon automoc4 chromaprint
-    pkgconfig cmake python3 ffmpeg_3 phonon automoc4
+    docbook_xml_dtd_45 docbook_xsl libxslt id3lib taglib mp4v2 flac
-    chromaprint docbook_xml_dtd_45 docbook_xsl libxslt
+    libogg libvorbis zlib readline qtbase qttools qtmultimedia
-    id3lib taglib mp4v2 flac libogg libvorbis zlib readline
+    qtquickcontrols ];
-    qtbase qttools qtmultimedia qtquickcontrols ];
 
   cmakeFlags = [ "-DWITH_APPS=Qt;CLI" ];
   NIX_LDFLAGS = "-lm -lpthread";

pkgs/applications/audio/ncpamixer/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, ncurses, libpulseaudio, pkgconfig }:
+{ stdenv, fetchFromGitHub, cmake, ncurses, libpulseaudio, pkg-config }:
 
 stdenv.mkDerivation rec {
 
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ ncurses libpulseaudio ];
-  nativeBuildInputs = [ cmake pkgconfig ];
+  nativeBuildInputs = [ cmake pkg-config ];
 
   configurePhase = ''
     make PREFIX=$out build/Makefile

pkgs/applications/audio/petrifoo/default.nix

@@ -1,6 +1,6 @@
 { stdenv, fetchurl, alsaLib, cmake, gtk2, libjack2, libgnomecanvas
 , libpthreadstubs, libsamplerate, libsndfile, libtool, libxml2
-, pkgconfig, openssl }:
+, pkg-config, openssl }:
 
 stdenv.mkDerivation  rec {
   pname = "petri-foo";
@@ -11,10 +11,10 @@ stdenv.mkDerivation  rec {
     sha256 = "0b25iicgn8c42487fdw32ycfrll1pm2zjgy5djvgw6mfcaa4gizh";
   };
 
-  buildInputs =
+  nativeBuildInputs = [ cmake pkg-config ];
-   [ alsaLib cmake gtk2 libjack2 libgnomecanvas libpthreadstubs
+
-     libsamplerate libsndfile libtool libxml2 pkgconfig openssl
+  buildInputs = [ alsaLib gtk2 libjack2 libgnomecanvas libpthreadstubs
-   ];
+                  libsamplerate libsndfile libtool libxml2 openssl ];
 
   meta = with stdenv.lib; {
     description = "MIDI controllable audio sampler";

pkgs/applications/audio/sorcer/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub , boost, cairomm, cmake, libsndfile, lv2, ntk, pkgconfig, python }:
+{ stdenv, fetchFromGitHub , boost, cairomm, cmake, libsndfile, lv2, ntk, pkg-config, python }:
 
 stdenv.mkDerivation rec {
   pname = "sorcer";
@@ -11,8 +11,8 @@ stdenv.mkDerivation rec {
     sha256 = "1x7pi77nal10717l02qpnhrx6d7w5nqrljkn9zx5w7gpb8fpb3vp";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ cmake pkg-config ];
-  buildInputs = [ boost cairomm cmake libsndfile lv2 ntk python ];
+  buildInputs = [ boost cairomm libsndfile lv2 ntk python ];
 
   postPatch = ''
      # Fix build with lv2 1.18: https://github.com/brummer10/guitarix/commit/c0334c72

pkgs/applications/audio/ympd/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, mpd_clientlib, openssl }:
+{ stdenv, fetchFromGitHub, cmake, pkg-config, mpd_clientlib, openssl }:
 
 stdenv.mkDerivation rec {
   pname = "ympd";
@@ -11,8 +11,8 @@ stdenv.mkDerivation rec {
     sha256 = "1nvb19jd556v2h2bi7w4dcl507p3p8xvjkqfzrcsy7ccy3502brq";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ cmake pkg-config ];
-  buildInputs = [ cmake mpd_clientlib openssl ];
+  buildInputs = [ mpd_clientlib openssl ];
 
   meta = {
     homepage = "https://www.ympd.org";

pkgs/applications/audio/zynaddsubfx/default.nix

@@ -1,5 +1,5 @@
 { stdenv, fetchurl, alsaLib, cairo, cmake, libjack2, fftw, fltk13, lash,  libjpeg
-, libXpm, minixml, ntk, pkgconfig, zlib, liblo
+, libXpm, minixml, ntk, pkg-config, zlib, liblo
 }:
 
 stdenv.mkDerivation  rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation  rec {
   };
 
   buildInputs = [ alsaLib cairo libjack2 fftw fltk13 lash libjpeg libXpm minixml ntk zlib liblo ];
-  nativeBuildInputs = [ cmake pkgconfig ];
+  nativeBuildInputs = [ cmake pkg-config ];
 
   patchPhase = ''
     substituteInPlace src/Misc/Config.cpp --replace /usr $out

pkgs/applications/editors/bonzomatic/default.nix

@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
     sha256 = "12mdfjvbhdqz1585772rj4cap8m4ijfci6ib62jysxjf747k41fg";
   };
 
-  buildInputs = [ cmake makeWrapper alsaLib mesa_glu libXcursor libXinerama libXrandr xorgserver ];
+  nativeBuildInputs = [ cmake makeWrapper ];
+  buildInputs = [ alsaLib mesa_glu libXcursor libXinerama libXrandr xorgserver ];
 
   postFixup = ''
     wrapProgram $out/bin/Bonzomatic --prefix LD_LIBRARY_PATH : "${alsaLib}/lib"

pkgs/applications/editors/emacs-modes/melpa-packages.nix

@@ -583,7 +583,8 @@ let
         };
 
         vterm = super.vterm.overrideAttrs (old: {
-          buildInputs = old.buildInputs ++ [ self.emacs pkgs.cmake pkgs.libvterm-neovim ];
+          nativeBuildInputs = [ pkgs.cmake ];
+          buildInputs = old.buildInputs ++ [ self.emacs pkgs.libvterm-neovim ];
           cmakeFlags = [
             "-DEMACS_SOURCE=${self.emacs.src}"
             "-DUSE_SYSTEM_LIBVTERM=ON"

pkgs/applications/graphics/autopanosiftc/default.nix

@@ -8,7 +8,8 @@ stdenv.mkDerivation {
     sha256 = "0dqk8ff82gmy4v5ns5nr9gpzkc1p7c2y8c8fkid102r47wsjk44s";
   };
 
-  buildInputs = [ cmake libpng libtiff libjpeg panotools libxml2 ];
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ libpng libtiff libjpeg panotools libxml2 ];
 
   patches = [
     (fetchurl {

pkgs/applications/graphics/freecad/default.nix

@@ -27,7 +27,7 @@ in mkDerivation rec {
   ];
 
   buildInputs = [
-    cmake coin3d xercesc ode eigen opencascade-occt gts
+    coin3d xercesc ode eigen opencascade-occt gts
     zlib swig gfortran soqt libf2c makeWrapper mpi vtk hdf5 medfile
     libGLU libXmu qtbase qttools qtwebengine qtxmlpatterns
   ] ++ (with pythonPackages; [

pkgs/applications/graphics/freepv/default.nix

@@ -9,8 +9,8 @@ stdenv.mkDerivation {
     sha256 = "1w19abqjn64w47m35alg7bcdl1p97nf11zn64cp4p0dydihmhv56";
   };
 
-  buildInputs = [ libjpeg libGLU libGL freeglut zlib cmake libX11 libxml2 libpng
+  nativeBuildInputs = [ cmake ];
-    libXxf86vm ];
+  buildInputs = [ libjpeg libGLU libGL freeglut zlib libX11 libxml2 libpng libXxf86vm ];
 
   postPatch = ''
     sed -i -e '/GECKO/d' CMakeLists.txt

pkgs/applications/graphics/pbrt/default.nix

@@ -1,7 +1,6 @@
 {stdenv, fetchFromGitHub, flex, bison, cmake, git, zlib}:
 
 stdenv.mkDerivation {
-
   version = "2018-08-15";
   pname = "pbrt-v3";
 
@@ -18,12 +17,13 @@ stdenv.mkDerivation {
     ./openexr-cmake-3.12.patch
   ];
 
-  buildInputs = [ git flex bison cmake zlib ];
+  nativeBuildInputs = [ flex bison cmake ];
+  buildInputs = [ zlib ];
 
   meta = with stdenv.lib; {
     homepage = "http://pbrt.org";
     description = "The renderer described in the third edition of the book 'Physically Based Rendering: From Theory To Implementation'";
-    platforms = platforms.linux ;
+    platforms = platforms.linux;
     license = licenses.bsd2;
     maintainers = [ maintainers.juliendehos ];
     priority = 10;

pkgs/applications/graphics/scantailor/default.nix

@@ -8,7 +8,8 @@ stdenv.mkDerivation {
     sha256 = "1pjx3a6hs16az6rki59bchy3biy7jndjx8r125q01aq7lbf5npgg";
   };
 
-  buildInputs = [ qt4 cmake libjpeg libtiff boost ];
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ qt4 libjpeg libtiff boost ];
 
   enableParallelBuilding = true;
 

pkgs/applications/graphics/screencloud/default.nix

@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   # for tracking usage.
   consumerKey = "23e747012c68601f27ab69c6de129ed70552d55b6";
   consumerSecret = "4701cb00c1bd357bbcae7c3d713dd216";
-  
+
   src = fetchFromGitHub {
     owner = "olav-st";
     repo = "screencloud";
@@ -17,7 +17,8 @@ stdenv.mkDerivation rec {
     sha256 = "1s0dxa1sa37nvna5nfqdsp294810favj68qb7ghl78qna7zw0cim";
   };
 
-  buildInputs = [ cmake qt4 quazip qt-mobility qxt pythonPackages.python pythonPackages.pycrypto ];
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ qt4 quazip qt-mobility qxt pythonPackages.python pythonPackages.pycrypto ];
 
   patchPhase = ''
     # Required to make the configure script work. Normally, screencloud's
@@ -28,8 +29,6 @@ stdenv.mkDerivation rec {
     substituteInPlace "CMakeLists.txt" --replace "set(CMAKE_INSTALL_PREFIX \"/opt\")" ""
   '';
 
-  enableParallelBuilding = true;
-
   # We need to append /opt to our CMAKE_INSTALL_PREFIX, so we tell the Nix not
   # to add the argument for us.
   dontAddPrefix = true;

pkgs/applications/graphics/smartdeblur/default.nix

@@ -16,9 +16,8 @@ stdenv.mkDerivation rec {
     cd src
   '';
 
-  enableParallelBuilding = true;
+  nativeBuildInputs = [ cmake ];
-
+  buildInputs = [ qt4 fftw ];
-  buildInputs = [ cmake qt4 fftw ];
 
   cmakeFlags = [ "-DUSE_SYSTEM_FFTW=ON" ];
 

pkgs/applications/misc/apvlv/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, cmake, pkgconfig, pcre, libxkbcommon, epoxy
+{ stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config, pcre, libxkbcommon, epoxy
 , gtk3, poppler, freetype, libpthreadstubs, libXdmcp, libxshmfence, wrapGAppsHook
 }:
 
@@ -16,12 +16,12 @@ stdenv.mkDerivation rec {
   NIX_CFLAGS_COMPILE = "-I${poppler.dev}/include/poppler";
 
   nativeBuildInputs = [
-    pkgconfig
+    cmake
+    pkg-config
     wrapGAppsHook
   ];
 
   buildInputs = [
-    cmake
     poppler pcre libxkbcommon epoxy
     freetype gtk3
     libpthreadstubs libXdmcp libxshmfence # otherwise warnings in compilation

pkgs/applications/misc/dfilemanager/default.nix

@@ -1,18 +1,17 @@
-{ stdenv, mkDerivation, fetchgit, cmake, file, qtbase, qttools, solid }:
+{ stdenv, fetchgit, cmake, file, qtbase, qttools, solid }:
 
-let
+stdenv.mkDerivation {
-  version = "git-2016-01-10";
-in
-mkDerivation {
   pname = "dfilemanager";
-  inherit version;
+  version = "git-2016-01-10";
+
   src = fetchgit {
     url = "git://git.code.sf.net/p/dfilemanager/code";
     rev = "2c5078b05e0ad74c037366be1ab3e6a03492bde4";
     sha256 = "1qwhnlcc2j8sr1f3v63sxs3m7q7w1xy6c2jqsnznjgm23b5h3hxd";
   };
 
-  buildInputs = [ cmake qtbase qttools file solid ];
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ qtbase qttools file solid ];
 
   cmakeFlags = [ "-DQT5BUILD=true" ];
 

pkgs/applications/misc/keepassx/2.0.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, libgcrypt, qt4, xorg, ... }:
+{ stdenv, fetchurl, cmake, libgcrypt, qt4, xorg }:
 
 stdenv.mkDerivation rec {
   pname = "keepassx2";
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
     sha256 = "1ia7cqx9ias38mnffsl7da7g1f66bcbjsi23k49sln0c6spb9zr3";
   };
 
-  buildInputs = [ cmake libgcrypt qt4 xorg.libXtst ];
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ libgcrypt qt4 xorg.libXtst ];
 
   meta = {
     description = "Qt password manager compatible with its Win32 and Pocket PC versions";

pkgs/applications/misc/kiwix/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, pkgconfig
+{ stdenv, fetchurl, makeWrapper, pkg-config
 , zip, python, zlib, which, icu, libmicrohttpd, lzma, aria2, wget, bc
 , libuuid, libX11, libXext, libXt, libXrender, glib, dbus, dbus-glib
 , gtk2, gdk-pixbuf, pango, cairo, freetype, fontconfig, alsaLib, atk, cmake
@@ -38,7 +38,7 @@ let
       sha256 = "0sqk0vdwjq44jxbbkj1cy8qykrmafs1sickzldb2w2nshsnjshhg";
     };
 
-    buildInputs = [ cmake ];
+    nativeBuildInputs = [ cmake ];
 
     unpackPhase = ''
       # not a nice src archive: all the files are in the root :(
@@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
     sha256 = "0577phhy2na59cpcqjgldvksp0jwczyg0l6c9ghnr19i375l7yqc";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [
     zip python zlib xapian which icu libmicrohttpd
     lzma zimlib ctpp2 aria2 wget bc libuuid makeWrapper pugixml

pkgs/applications/misc/lenmus/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, pkgconfig, fetchFromGitHub, fetchpatch
+{ stdenv, pkg-config, fetchFromGitHub, fetchpatch
 , cmake, boost
 , portmidi, sqlite
 , freetype, libpng, pngpp, zlib
@@ -29,9 +29,9 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ cmake pkg-config ];
   buildInputs = [
-    cmake boost
+    boost
     portmidi sqlite
     freetype libpng pngpp zlib
     wxGTK30 wxsqlite3

pkgs/applications/misc/opencpn/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkgconfig, cmake, gtk2, wxGTK30, libpulseaudio, curl,
+{ stdenv, fetchFromGitHub, pkg-config, cmake, gtk2, wxGTK30, libpulseaudio, curl,
   gettext, glib, portaudio }:
 
 stdenv.mkDerivation rec {
@@ -12,8 +12,8 @@ stdenv.mkDerivation rec {
     sha256 = "0yiqahkzwcbzgabc5xgxmwlngapkfiaqyva3mwz29xj0c5lg2bdk";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ cmake pkg-config ];
-  buildInputs = [ cmake gtk2 wxGTK30 libpulseaudio curl gettext
+  buildInputs = [ gtk2 wxGTK30 libpulseaudio curl gettext
                   glib portaudio ];
 
   cmakeFlags = [
@@ -21,8 +21,6 @@ stdenv.mkDerivation rec {
     "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include"
   ];
 
-  enableParallelBuilding = true;
-
   meta = {
     description = "A concise ChartPlotter/Navigator";
     maintainers = [ stdenv.lib.maintainers.kragniz ];

pkgs/applications/misc/posterazor/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, unzip, pkgconfig, libXpm, fltk13, freeimage }:
+{ stdenv, fetchurl, cmake, unzip, pkg-config, libXpm, fltk13, freeimage }:
 
 stdenv.mkDerivation {
   name = "posterazor-1.5.1";
@@ -10,8 +10,8 @@ stdenv.mkDerivation {
 
   hardeningDisable = [ "format" ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ cmake pkg-config unzip ];
-  buildInputs = [ cmake unzip libXpm fltk13 freeimage ];
+  buildInputs = [ libXpm fltk13 freeimage ];
 
   unpackPhase = ''
     unzip $src -d posterazor

pkgs/applications/misc/sqliteman/default.nix

@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
     sha256 = "1blzyh1646955d580f71slgdvz0nqx0qacryx0jc9w02yrag17cs";
   };
 
-  buildInputs = [ cmake qt4 qscintilla ];
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ qt4 qscintilla ];
 
   prePatch = ''
     sed -i 's,m_file(0),m_file(QString()),' Sqliteman/sqliteman/main.cpp

pkgs/applications/misc/tellico/default.nix

@@ -42,7 +42,6 @@ mkDerivation rec {
   ];
 
   buildInputs = [
-    cmake
     exempi
     extra-cmake-modules
     karchive

pkgs/applications/networking/flent/http-getter.nix

@@ -1,5 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake
+{ stdenv, fetchFromGitHub, cmake, curl, pkg-config }:
-, curl, pkgconfig }:
 
 stdenv.mkDerivation {
   pname = "http-getter";
@@ -12,7 +11,8 @@ stdenv.mkDerivation {
     sha256 = "0plyqqwfm9bysichda0w3akbdxf6279wd4mx8mda0c4mxd4xy9nl";
   };
 
-  buildInputs = [ cmake pkgconfig curl ];
+  nativeBuildInputs = [ cmake pkg-config ];
+  buildInputs = [ curl ];
 
   meta = with stdenv.lib; {
     homepage = "https://github.com/tohojo/http-getter";

pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix

@@ -13,7 +13,8 @@ stdenv.mkDerivation {
     sha256 = "02p57fgx8ml00cbrb4f280ak2802svz80836dzk9f1zwm1bcr2qc";
   };
 
-  buildInputs = [ pidgin cmake libxml2 ];
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ pidgin libxml2 ];
 
   preConfigure = ''
     sed -i -e 's|DESTINATION.*PURPLE_PLUGIN_DIR}|DESTINATION lib/purple-2|' CMakeLists.txt

pkgs/applications/networking/instant-messengers/ring-daemon/restbed.nix

@@ -19,11 +19,8 @@ stdenv.mkDerivation {
 
   inherit patches;
 
-  buildInputs = [
+  nativeBuildInputs = [ cmake ];
-    cmake
+  buildInputs = [ asio openssl ];
-    asio
-    openssl
-  ];
 
   meta = with stdenv.lib; {
     description = "HTTP framework for building networked applications";

pkgs/applications/networking/irc/quassel/default.nix

@@ -54,8 +54,8 @@ in (if !buildClient then stdenv.mkDerivation else mkDerivation) rec {
   # Prevent ``undefined reference to `qt_version_tag''' in SSL check
   NIX_CFLAGS_COMPILE = "-DQT_NO_VERSION_TAGGING=1";
 
-  buildInputs =
+  nativeBuildInputs = [ cmake makeWrapper ];
-       [ cmake makeWrapper qtbase ]
+  buildInputs = [ qtbase ]
     ++ lib.optionals buildCore [qtscript qca-qt5]
     ++ lib.optionals buildClient [libdbusmenu phonon]
     ++ lib.optionals (buildClient && withKDE) [

pkgs/applications/networking/irc/weechat/default.nix

@@ -1,6 +1,6 @@
 { stdenv, fetchurl, lib
 , ncurses, openssl, aspell, gnutls, gettext
-, zlib, curl, pkgconfig, libgcrypt
+, zlib, curl, pkg-config, libgcrypt
 , cmake, makeWrapper, libobjc, libresolv, libiconv
 , asciidoctor # manpages
 , guileSupport ? true, guile
@@ -37,7 +37,6 @@ let
 
       outputs = [ "out" "man" ] ++ map (p: p.name) enabledPlugins;
 
-      enableParallelBuilding = true;
       cmakeFlags = with stdenv.lib; [
         "-DENABLE_MAN=ON"
         "-DENABLE_DOC=ON"
@@ -48,10 +47,10 @@ let
         ++ map (p: "-D${p.cmakeFlag}=" + (if p.enabled then "ON" else "OFF")) plugins
         ;
 
+      nativeBuildInputs = [ cmake pkg-config makeWrapper asciidoctor ];
       buildInputs = with stdenv.lib; [
-          ncurses openssl aspell gnutls gettext zlib curl pkgconfig
+          ncurses openssl aspell gnutls gettext zlib curl
-          libgcrypt makeWrapper cmake asciidoctor
+          libgcrypt ]
-          ]
         ++ optionals stdenv.isDarwin [ libobjc libresolv ]
         ++ concatMap (p: p.buildInputs) enabledPlugins
         ++ extraBuildInputs;

pkgs/applications/office/tagainijisho/default.nix

@@ -7,7 +7,8 @@ stdenv.mkDerivation {
     sha256 = "0kmg1940yiqfm4vpifyj680283ids4nsij9s750nrshwxiwwbqvg";
   };
 
-  buildInputs = [ qt4 cmake sqlite ];
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ qt4 sqlite ];
 
   meta = with stdenv.lib; {
     description = "A free, open-source Japanese dictionary and kanji lookup tool";

pkgs/applications/radio/gnuradio/ais.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, boost, gnuradio
+{ stdenv, fetchFromGitHub, cmake, pkg-config, boost, gnuradio
 , makeWrapper, cppunit, gr-osmosdr, log4cpp
 , pythonSupport ? true, python, swig
 }:
@@ -17,10 +17,9 @@ stdenv.mkDerivation {
     sha256 = "1b9j0kc74cw12a7jv4lii77dgzqzg2s8ndzp4xmisxksgva1qfvh";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ cmake makeWrapper pkg-config ];
-  buildInputs = [
+  buildInputs = [ boost gnuradio cppunit gr-osmosdr log4cpp ]
-    cmake boost gnuradio makeWrapper cppunit gr-osmosdr log4cpp
+             ++ stdenv.lib.optionals pythonSupport [ python swig ];
-  ] ++ stdenv.lib.optionals pythonSupport [ python swig ];
 
   postInstall = ''
     for prog in "$out"/bin/*; do

pkgs/applications/radio/gnuradio/gsm.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, boost, gnuradio, log4cpp
+{ stdenv, fetchFromGitHub, cmake, pkg-config, boost, gnuradio, log4cpp
 , makeWrapper, cppunit, libosmocore, gr-osmosdr
 , pythonSupport ? true, python, swig
 }:
@@ -16,9 +16,9 @@ stdenv.mkDerivation {
     sha256 = "13nnq927kpf91iqccr8db9ripy5czjl5jiyivizn6bia0bam2pvx";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ cmake pkg-config ];
   buildInputs = [
-    cmake boost gnuradio makeWrapper cppunit libosmocore gr-osmosdr log4cpp
+    boost gnuradio makeWrapper cppunit libosmocore gr-osmosdr log4cpp
   ] ++ stdenv.lib.optionals pythonSupport [ python swig ];
 
   postInstall = ''

pkgs/applications/radio/gnuradio/nacl.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, boost, gnuradio, uhd
+{ stdenv, fetchFromGitHub, cmake, pkg-config, boost, gnuradio, uhd
 , makeWrapper, libsodium, cppunit, log4cpp
 , pythonSupport ? true, python, swig
 }:
@@ -16,9 +16,9 @@ stdenv.mkDerivation {
     sha256 = "018np0qlk61l7mlv3xxx5cj1rax8f1vqrsrch3higsl25yydbv7v";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ cmake pkg-config ];
   buildInputs = [
-    cmake boost gnuradio uhd makeWrapper libsodium cppunit log4cpp
+    boost gnuradio uhd makeWrapper libsodium cppunit log4cpp
   ] ++ stdenv.lib.optionals pythonSupport [ python swig ];
 
   postInstall = ''

pkgs/applications/radio/gnuradio/osmosdr.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, cmake, pkgconfig, makeWrapper
+{ stdenv, fetchgit, cmake, pkg-config, makeWrapper
 , boost
 , pythonSupport ? true, python, swig
 , airspy
@@ -23,10 +23,9 @@ stdenv.mkDerivation rec {
     sha256 = "0bf9bnc1c3c4yqqqgmg3nhygj6rcfmyk6pybi27f7461d2cw1drv";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ cmake makeWrapper pkg-config ];
   buildInputs = [
-    cmake makeWrapper boost log4cpp
+    boost log4cpp airspy gnuradio hackrf libbladeRF rtl-sdr uhd
-    airspy gnuradio hackrf libbladeRF rtl-sdr uhd
   ] ++ stdenv.lib.optionals stdenv.isLinux [ soapysdr-with-plugins ]
     ++ stdenv.lib.optionals pythonSupport [ python swig python.pkgs.cheetah ];
 

pkgs/applications/radio/gnuradio/rds.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, boost, gnuradio, log4cpp
+{ stdenv, fetchFromGitHub, cmake, pkg-config, boost, gnuradio, log4cpp
 , makeWrapper, pythonSupport ? true, python, swig
 }:
 
@@ -15,9 +15,9 @@ stdenv.mkDerivation rec {
     sha256 = "0jkzchvw0ivcxsjhi1h0mf7k13araxf5m4wi5v9xdgqxvipjzqfy";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ cmake pkg-config ];
   buildInputs = [
-    cmake boost gnuradio makeWrapper log4cpp
+    boost gnuradio makeWrapper log4cpp
   ] ++ stdenv.lib.optionals pythonSupport [ python swig ];
 
   postInstall = ''

pkgs/applications/radio/tqsl/default.nix

@@ -9,9 +9,8 @@ stdenv.mkDerivation rec {
     sha256 = "00v4n8pvi5qi2psjnrw611w5gg5bdlaxbsny535fsci3smyygpc0";
   };
 
-  nativeBuildInputs = [ makeWrapper ];
+  nativeBuildInputs = [ cmake makeWrapper ];
   buildInputs = [
-    cmake
     expat
     openssl
     zlib

pkgs/applications/science/astronomy/openspace/default.nix

@@ -14,8 +14,8 @@ stdenv.mkDerivation rec {
     fetchSubmodules = true;
   };
 
+  nativeBuildInputs = [ cmake makeWrapper ];
   buildInputs = [
-    makeWrapper cmake
     curl boost gdal glew soil
     libX11 libXi libXxf86vm libXcursor libXrandr libXinerama
   ];

pkgs/applications/science/biology/cmtk/default.nix

@@ -9,7 +9,7 @@ stdenv.mkDerivation {
     sha256 = "1nmsga9m7vcc4y4a6zl53ra3mwlgjwdgsq1j291awkn7zr1az6qs";
   };
 
-  buildInputs = [cmake];
+  nativeBuildInputs = [ cmake ];
 
   NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=c++11-narrowing";
 

pkgs/applications/science/biology/somatic-sniper/default.nix

@@ -13,7 +13,8 @@ stdenv.mkDerivation rec {
 
   patches = [ ./somatic-sniper.patch ];
 
-  buildInputs = [ cmake zlib ncurses ];
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ zlib ncurses ];
 
   enableParallelBuilding = false;
 

pkgs/applications/science/electronics/qfsm/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, qt4, cmake, graphviz, pkgconfig }:
+{ stdenv, fetchurl, qt4, cmake, graphviz, pkg-config }:
 
 stdenv.mkDerivation rec {
   name = "qfsm-0.54.0";
@@ -8,8 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "0rl7bc5cr29ng67yij4akciyid9z7npal812ys4c3m229vjvflrb";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ cmake pkg-config ];
-  buildInputs = [ qt4 cmake graphviz ];
+  buildInputs = [ qt4 graphviz ];
 
   patches = [
     ./drop-hardcoded-prefix.patch
@@ -18,8 +18,6 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = [ "format" ];
 
-  enableParallelBuilding = true;
-
   meta = {
     description = "Graphical editor for finite state machines";
     homepage = "http://qfsm.sourceforge.net/";

pkgs/applications/science/electronics/qucs/default.nix

@@ -17,7 +17,8 @@ stdenv.mkDerivation rec {
     ./cmakelists.patch
   ];
 
-  buildInputs = [ flex bison qt4 libX11 cmake gperf adms ];
+  nativeBuildInputs = [ cmake flex bison ];
+  buildInputs = [ qt4 libX11 gperf adms ];
 
   meta = {
     description = "Integrated circuit simulator";

pkgs/applications/science/logic/avy/default.nix

@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
     fetchSubmodules = true;
   };
 
-  buildInputs = [ cmake zlib boost.out boost.dev ];
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ zlib boost.out boost.dev ];
   NIX_CFLAGS_COMPILE = toString ([ "-Wno-narrowing" ]
     # Squelch endless stream of warnings on same few things
     ++ stdenv.lib.optionals stdenv.cc.isClang [

pkgs/applications/science/logic/lean2/default.nix

@@ -12,8 +12,8 @@ stdenv.mkDerivation {
     sha256 = "1xv3j487zhh1zf2b4v19xzw63s2sgjhg8d62a0kxxyknfmdf3khl";
   };
 
-  buildInputs = [ gmp mpfr cmake python gperftools ninja makeWrapper ];
+  nativeBuildInputs = [ cmake makeWrapper ninja ];
-  enableParallelBuilding = true;
+  buildInputs = [ gmp mpfr python gperftools ];
 
   preConfigure = ''
     patchShebangs bin/leantags

pkgs/applications/science/logic/mcrl2/default.nix

@@ -10,9 +10,8 @@ stdenv.mkDerivation rec {
     sha256 = "1c8h94ja7271ph61zrcgnjgblxppld6v22f7f900prjgzbcfy14m";
   };
 
-  buildInputs = [ cmake libGLU libGL qt5.qtbase boost ];
+  nativeBuildInputs = [ cmake ];
-
+  buildInputs = [ libGLU libGL qt5.qtbase boost ];
-  enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
     description = "A toolset for model-checking concurrent systems and protocols";

pkgs/applications/science/logic/monosat/default.nix

@@ -31,7 +31,8 @@ let
   core = stdenv.mkDerivation {
     name = "${pname}-${version}";
     inherit src patches;
-    buildInputs = [ cmake zlib gmp jdk8 ];
+    nativeBuildInputs = [ cmake ];
+    buildInputs = [ zlib gmp jdk8 ];
 
     cmakeFlags = [
       "-DBUILD_STATIC=OFF"

pkgs/applications/science/machine-learning/shogun/default.nix

@@ -65,8 +65,9 @@ stdenv.mkDerivation rec {
   CCACHE_DISABLE="1";
   CCACHE_DIR=".ccache";
 
+  nativeBuildInputs = [ cmake ];
   buildInputs = with lib; [
-      blas lapack bzip2 cmake colpack curl ctags eigen hdf5 json_c lp_solve lzma lzo
+      blas lapack bzip2 colpack curl ctags eigen hdf5 json_c lp_solve lzma lzo
       protobuf nlopt snappy swig (libarchive.dev) libxml2 lapack glpk
     ]
     ++ optionals (pythonSupport) (with pythonPackages; [ python ply numpy ])

pkgs/applications/science/misc/gplates/default.nix

@@ -10,8 +10,9 @@ stdenv.mkDerivation rec {
     sha256 = "1jrcv498vpcs8xklhbsgg12yfa90f96p2mwq6x5sjnrlpf8mh50b";
   };
 
+  nativeBuildInputs = [ cmake ];
   buildInputs = [
-    qt4 qwt6_qt4 libGLU libGL glew gdal cgal proj cmake python2
+    qt4 qwt6_qt4 libGLU libGL glew gdal cgal proj python2
     doxygen graphviz gmp mpfr
     (boost.override {
       enablePython = true;

pkgs/applications/science/misc/root/5.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, cmake, pcre, pkgconfig, python2
+{ stdenv, fetchurl, fetchpatch, cmake, pcre, pkg-config, python2
 , libX11, libXpm, libXft, libXext, libGLU, libGL, zlib, libxml2, lz4, lzma, gsl_1, xxHash
 , Cocoa, OpenGL, noSplash ? false }:
 
@@ -11,8 +11,8 @@ stdenv.mkDerivation rec {
     sha256 = "1ln448lszw4d6jmbdphkr2plwxxlhmjkla48vmmq750xc1lxlfrc";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ cmake pkg-config ];
-  buildInputs = [ cmake pcre python2 zlib libxml2 lz4 lzma gsl_1 xxHash ]
+  buildInputs = [ pcre python2 zlib libxml2 lz4 lzma gsl_1 xxHash ]
     ++ stdenv.lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU libGL ]
     ++ stdenv.lib.optionals (stdenv.isDarwin) [ Cocoa OpenGL ]
     ;

pkgs/applications/science/misc/vite/default.nix

@@ -23,7 +23,8 @@ stdenv.mkDerivation {
     ln -sv "${externals}" externals
   '';
 
-  buildInputs = [ cmake qt4 libGLU libGL ];
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ qt4 libGLU libGL ];
 
   NIX_LDFLAGS = "-lGLU";
 

pkgs/applications/science/programming/scyther/cli.nix

@@ -6,12 +6,8 @@ stdenv.mkDerivation {
 
   inherit src meta;
 
-  buildInputs = [
+  nativeBuildInputs = [ cmake flex bison ];
-    cmake
+  buildInputs = [ glibc.static ];
-    glibc.static
-    flex
-    bison
-  ];
 
   patchPhase = ''
     # Since we're not in a git dir, the normal command this project uses to create this file wouldn't work

pkgs/applications/science/robotics/yarp/default.nix

@@ -11,9 +11,8 @@ stdenv.mkDerivation rec {
     sha256 = "0mphh899niy30xbjjwi9xpsliq8mladfldbbbjfngdrqfhiray1a";
   };
 
-  buildInputs = [ cmake ace ];
+  nativeBuildInputs = [ cmake ];
-
+  buildInputs = [ ace ];
-  enableParallelBuilding = true;
 
   cmakeFlags = [
     "-DYARP_COMPILE_UNMAINTAINED:BOOL=ON"

pkgs/applications/version-management/sit/default.nix

@@ -13,8 +13,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "06xkhlfix0h6di6cnvc4blbj3mjy90scbh89dvywbx16wjlc79pf";
   };
 
-  buildInputs = [ cmake libzip gnupg ] ++
+  nativeBuildInputs = [ cmake ];
-    (if stdenv.isDarwin then [ libiconv CoreFoundation Security ] else []);
+  buildInputs = [ libzip gnupg ]
+    ++ (stdenv.lib.optionals stdenv.isDarwin [ libiconv CoreFoundation Security ]);
 
   preCheck = ''
     export HOME=$(mktemp -d)

pkgs/applications/video/kodi/plugins.nix

@@ -47,7 +47,8 @@ let self = rec {
       sha256 = "1r3gs3c6zczmm66qcxh9mr306clwb3p7ykzb70r3jv5jqggiz199";
     };
 
-    buildInputs = [ cmake kodiPlain libcec_platform tinyxml ];
+    nativeBuildInputs = [ cmake ];
+    buildInputs = [ kodiPlain libcec_platform tinyxml ];
   };
 
   mkKodiPlugin = { plugin, namespace, version, sourceDir ? null, ... }@args:
@@ -75,8 +76,8 @@ let self = rec {
 
     dontStrip = true;
 
-    buildInputs = [ cmake kodiPlain kodi-platform libcec_platform ]
+    nativeBuildInputs = [ cmake ];
-               ++ extraBuildInputs;
+    buildInputs = [ kodiPlain kodi-platform libcec_platform ] ++ extraBuildInputs;
 
     inherit extraRuntimeDependencies;
 

pkgs/applications/virtualization/xen/generic.nix

@@ -1,5 +1,5 @@
 config:
-{ stdenv, cmake, pkgconfig, which
+{ stdenv, cmake, pkg-config, which
 
 # Xen
 , bison, bzip2, checkpolicy, dev86, figlet, flex, gettext, glib
@@ -66,7 +66,7 @@ stdenv.mkDerivation (rec {
 
   hardeningDisable = [ "stackprotector" "fortify" "pic" ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [
     cmake which
 

pkgs/data/misc/shared-desktop-ontologies/default.nix

@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   name = "shared-desktop-ontologies-0.11.0";
-  
+
   src = fetchurl {
     url = "mirror://sourceforge/oscaf/${name}.tar.bz2";
     sha256 = "1m5vnijg7rnwg41vig2ckg632dlczzdab1gsq51g4x7m9k1fdbw2";
   };
-  
+
-  buildInputs = [ cmake ];
+  nativeBuildInputs = [ cmake ];
-  
+
   meta = with stdenv.lib; {
     homepage = "http://oscaf.sourceforge.net/";
     description = "Ontologies necessary for the Nepomuk semantic desktop";
@@ -23,4 +23,3 @@ stdenv.mkDerivation rec {
     maintainers = [ maintainers.sander ];
   };
 }
-

pkgs/development/compilers/dale/default.nix

@@ -1,18 +1,16 @@
 { stdenv
 , fetchFromGitHub
 , cmake
-, pkgconfig
+, pkg-config
 , libffi
 , llvm_6
 , doCheck ? false
 , perl
 }:
 
-let version = "20181024";
+stdenv.mkDerivation {
-
-in stdenv.mkDerivation {
   pname = "dale";
-  inherit version;
+  version = "20181024";
 
   src = fetchFromGitHub {
     owner = "tomhrr";
@@ -21,16 +19,14 @@ in stdenv.mkDerivation {
     sha256 = "0v4ajrzrqvf279kd7wsd9flrpsav57lzxlwwimk9vnfwh7xpzf9v";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ cmake pkg-config ];
-  buildInputs = [ cmake libffi llvm_6 ]
+  buildInputs = [ libffi llvm_6 ];
-             ++ stdenv.lib.optional doCheck perl;
 
   inherit doCheck;
+  checkInputs = [ perl ];
 
   checkTarget = "tests";
 
-  enableParallelBuilding = true;
-
   meta = with stdenv.lib; {
     description = "Lisp-flavoured C";
     longDescription = ''

pkgs/development/compilers/hhvm/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, cmake, pkgconfig, boost, libunwind, libmemcached
+{ stdenv, fetchgit, cmake, pkg-config, boost, libunwind, libmemcached
 , pcre, libevent, gd, curl, libxml2, icu, flex, bison, openssl, zlib, php
 , expat, libcap, oniguruma, libdwarf, libmcrypt, tbb, gperftools, glog, libkrb5
 , bzip2, openldap, readline, libelf, uwimap, binutils, cyrus_sasl, pam, libpng
@@ -18,9 +18,10 @@ stdenv.mkDerivation rec {
     fetchSubmodules = true;
   };
 
+  nativeBuildInputs = [ cmake pkg-config flex bison ];
   buildInputs =
-    [ cmake pkgconfig boost libunwind libmysqlclient libmemcached pcre gdb git perl
+    [ boost libunwind libmysqlclient libmemcached pcre gdb git perl
-      libevent gd curl libxml2 icu flex bison openssl zlib php expat libcap
+      libevent gd curl libxml2 icu openssl zlib php expat libcap
       oniguruma libdwarf libmcrypt tbb gperftools bzip2 openldap readline
       libelf uwimap binutils cyrus_sasl pam glog libpng libxslt libkrb5
       gmp libyaml libedit libvpx imagemagick fribidi gperf which
@@ -31,7 +32,6 @@ stdenv.mkDerivation rec {
     ./flexible-array-members-gcc6.patch
   ];
 
-  enableParallelBuilding = true;
   dontUseCmakeBuildDir = true;
   NIX_LDFLAGS = "-lpam -L${pam}/lib";
 

pkgs/development/compilers/mono/generic.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, bison, pkgconfig, glib, gettext, perl, libgdiplus, libX11, callPackage, ncurses, zlib, withLLVM ? false, cacert, Foundation, libobjc, python3, version, sha256, autoconf, libtool, automake, cmake, which
+{ stdenv, fetchurl, bison, pkg-config, glib, gettext, perl, libgdiplus, libX11, callPackage, ncurses, zlib, withLLVM ? false, cacert, Foundation, libobjc, python3, version, sha256, autoconf, libtool, automake, cmake, which
 , gnumake42
 , enableParallelBuilding ? true
 , srcArchiveSuffix ? "tar.bz2"
@@ -17,9 +17,9 @@ stdenv.mkDerivation rec {
     url = "https://download.mono-project.com/sources/mono/${pname}-${version}.${srcArchiveSuffix}";
   };
 
-  nativeBuildInputs = [ gnumake42 ];
+  nativeBuildInputs = [ automake bison cmake pkg-config which gnumake42 ];
   buildInputs =
-    [ bison pkgconfig glib gettext perl libgdiplus libX11 ncurses zlib python3 autoconf libtool automake cmake which
+    [ glib gettext perl libgdiplus libX11 ncurses zlib python3 autoconf libtool
     ]
     ++ (stdenv.lib.optionals stdenv.isDarwin [ Foundation libobjc ]);
 

pkgs/development/compilers/mono/llvm.nix

@@ -24,7 +24,8 @@ stdenv.mkDerivation {
     sha256 = "07wd1cs3fdvzb1lv41b655z5zk34f47j8fgd9ljjimi5j9pj71f7";
   };
 
-  buildInputs = [ perl groff cmake libxml2 python2 libffi ] ++ lib.optional stdenv.isLinux valgrind;
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ perl groff libxml2 python2 libffi ] ++ lib.optional stdenv.isLinux valgrind;
 
   propagatedBuildInputs = [ ncurses zlib ];
 

pkgs/development/compilers/osl/default.nix

@@ -18,13 +18,13 @@ in clangStdenv.mkDerivation rec {
   };
 
   cmakeFlags = [ "-DUSE_BOOST_WAVE=ON" "-DENABLERTTI=ON" ];
-  enableParallelBuilding = true;
 
   preConfigure = '' patchShebangs src/liboslexec/serialize-bc.bash '';
-  
+
+  nativeBuildInputs = [ cmake boost_static flex bison];
   buildInputs = [
-     cmake zlib openexr openimageio llvm
+     zlib openexr openimageio llvm
-     boost_static flex bison partio pugixml
+     partio pugixml
      util-linux # needed just for hexdump
      python # CMake doesn't check this?
   ];

pkgs/development/compilers/ponyc/default.nix

@@ -29,7 +29,8 @@ stdenv.mkDerivation (rec {
     name = "v1.5.0.tar.gz";
   };
 
-  buildInputs = [ makeWrapper which libxml2 cmake z3 ];
+  nativeBuildInputs = [ cmake makeWrapper which ];
+  buildInputs = [ libxml2 z3 ];
   propagatedBuildInputs = [ cc ];
 
   # Sandbox disallows network access, so disabling problematic networking tests

pkgs/development/compilers/seexpr/default.nix

@@ -12,7 +12,8 @@ stdenv.mkDerivation {
     sha256 = "0a44k56jf6dl36fwgg4zpc252wq5lf9cblg74mp73k82hxw439l4";
   };
 
-  buildInputs = [ cmake libGLU libpng zlib qt4 pythonPackages.pyqt4 bison flex ];
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ libGLU libpng zlib qt4 pythonPackages.pyqt4 bison flex ];
   meta = with stdenv.lib; {
     description = "Embeddable expression evaluation engine from Disney Animation";
     homepage = "https://www.disneyanimation.com/technology/seexpr.html";

pkgs/development/interpreters/proglodyte-wasm/default.nix

@@ -14,7 +14,8 @@ let
       # set this to nonempty string to disable default cmake configure
     '';
 
-    buildInputs = [ cmake clang python ];
+    nativeBuildInputs = [ cmake ];
+    buildInputs = [ clang python ];
 
     buildPhase = "make clang-debug-no-tests";
 

pkgs/development/libraries/NSPlist/default.nix

@@ -10,7 +10,7 @@ stdenv.mkDerivation {
     sha256 = "0v4yfiwfd08hmh2ydgy6pnmlzjbd96k78dsla9pfd56ka89aw74r";
   };
 
-  buildInputs = [ cmake ];
+  nativeBuildInputs = [ cmake ];
 
   meta = with stdenv.lib; {
     maintainers = with maintainers; [ matthewbauer ];

pkgs/development/libraries/PlistCpp/default.nix

@@ -10,8 +10,8 @@ stdenv.mkDerivation {
     sha256 = "10jn6bvm9vn6492zix2pd724v5h4lccmkqg3lxfw8r0qg3av0yzv";
   };
 
-  buildInputs = [ cmake boost NSPlist pugixml ];
+  nativeBuildInputs = [ cmake ];
-
+  buildInputs = [ boost NSPlist pugixml ];
 
   meta = with stdenv.lib; {
     maintainers = with maintainers; [ matthewbauer ];

pkgs/development/libraries/alure/default.nix

@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
     sha256 = "0w8gsyqki21s1qb2s5ac1kj08i6nc937c0rr08xbw9w9wvd6lpj6";
   };
 
-  buildInputs = [ cmake openal ];
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ openal ];
 
   meta = with stdenv.lib; {
     description = "A utility library to help manage common tasks with OpenAL applications";

pkgs/development/libraries/assimp/default.nix

@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
     sha256 = "00vxzfcrs856qnyk806wqr67nmpjk06mjby0fqmyhm6i1jj2hg1w";
   };
 
-  buildInputs = [ cmake boost zlib ];
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ boost zlib ];
 
   meta = with stdenv.lib; {
     description = "A library to import various 3D model formats";

pkgs/development/libraries/audio/jamomacore/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkgconfig, alsaLib, portaudio, portmidi, libsndfile, cmake, libxml2 }:
+{ stdenv, fetchFromGitHub, pkg-config, alsaLib, portaudio, portmidi, libsndfile, cmake, libxml2 }:
 
 stdenv.mkDerivation rec {
   version = "1.0-beta.1";
@@ -11,8 +11,8 @@ stdenv.mkDerivation rec {
     sha256 = "1hb9b6qc18rsvzvixgllknn756m6zwcn22c79rdibbyz1bhrcnln";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ cmake pkg-config ];
-  buildInputs = [ alsaLib portaudio portmidi libsndfile cmake libxml2 ];
+  buildInputs = [ alsaLib portaudio portmidi libsndfile libxml2 ];
 
   meta = {
     description = "A C++ platform for building dynamic and reflexive systems with an emphasis on audio and media";

pkgs/development/libraries/audio/libgme/default.nix

@@ -20,9 +20,7 @@ in stdenv.mkDerivation {
     sha256 = "100ahb4n4pvgcry9xzlf2fr4j57n5h9x7pvyhhxys4dcy8axqqsy";
   };
 
-  buildInputs = [ cmake ];
+  nativeBuildInputs = [ cmake removeReferencesTo ];
-
-  nativeBuildInputs = [ removeReferencesTo ];
 
   # It used to reference it, in the past, but thanks to the postFixup hook, now
   # it doesn't.

pkgs/development/libraries/avro-c++/default.nix

@@ -11,11 +11,8 @@ stdenv.mkDerivation {
     sha256 = "1ars58bfw83s8f1iqbhnqp4n9wc9cxsph0gs2a8k7r9fi09vja2k";
   };
 
-  buildInputs = [
+  nativeBuildInputs = [ cmake ];
-    cmake
+  buildInputs = [ python2 boost ];
-    python2
-    boost
-  ];
 
   preConfigure = ''
     substituteInPlace test/SchemaTests.cc --replace "BOOST_CHECKPOINT" "BOOST_TEST_CHECKPOINT"

pkgs/development/libraries/box2d/default.nix

@@ -1,5 +1,5 @@
 { stdenv, fetchurl, unzip, cmake, libGLU, libGL, freeglut, libX11, xorgproto
-, libXi, pkgconfig }:
+, libXi, pkg-config }:
 
 stdenv.mkDerivation rec {
   pname = "box2d";
@@ -12,10 +12,8 @@ stdenv.mkDerivation rec {
 
   sourceRoot = "Box2D-${version}/Box2D";
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ cmake unzip pkg-config ];
-  buildInputs = [
+  buildInputs = [ libGLU libGL freeglut libX11 xorgproto libXi ];
-    unzip cmake libGLU libGL freeglut libX11 xorgproto libXi
-  ];
 
   cmakeFlags = [
     "-DBOX2D_INSTALL=ON"

pkgs/development/libraries/cegui/default.nix

@@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
     sha256 = "067562s71kfsnbp2zb2bmq8zj3jk96g5a4rcc5qc3n8nfyayhldk";
   };
 
-
+  nativeBuildInputs = [ cmake ];
-  buildInputs = [ cmake ogre freetype boost expat ];
+  buildInputs = [ ogre freetype boost expat ];
 
   meta = with stdenv.lib; {
     homepage = "http://cegui.org.uk/";

pkgs/development/libraries/cpp-ipfs-api/default.nix

@@ -11,7 +11,8 @@ stdenv.mkDerivation {
     sha256 = "1z6gbd7npg4pd9wmdyzcp9h12sg84d7a43c69pp4lzqkyqg8pz1g";
   };
 
-  buildInputs = [ cmake curl ];
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ curl ];
   propagatedBuildInputs = [ nlohmann_json ];
 
   meta = with stdenv.lib; {

pkgs/development/libraries/cpp-netlib/default.nix

@@ -12,14 +12,13 @@ stdenv.mkDerivation rec {
     fetchSubmodules = true;
   };
 
-  buildInputs = [ cmake boost openssl ];
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ boost openssl ];
 
   cmakeFlags = [
     "-DCPP-NETLIB_BUILD_SHARED_LIBS=ON"
   ];
 
-  enableParallelBuilding = true;
-
   # The test driver binary lacks an RPath to the library's libs
   preCheck = ''
     export LD_LIBRARY_PATH=$PWD/libs/network/src

pkgs/development/libraries/cppcms/default.nix

@@ -9,9 +9,8 @@ stdenv.mkDerivation rec {
       sha256 = "0lmcdjzicmzhnr8pa0q3f5lgapz2cnh9w0dr56i4kj890iqwgzhh";
   };
 
-  enableParallelBuilding = true;
+  nativeBuildInputs = [ cmake ];
-
+  buildInputs = [ pcre zlib python openssl ];
-  buildInputs = [ cmake pcre zlib python openssl ];
 
   cmakeFlags = [
     "--no-warn-unused-cli"

pkgs/development/libraries/cppdb/default.nix

@@ -9,9 +9,8 @@ stdenv.mkDerivation rec {
       sha256 = "0blr1casmxickic84dxzfmn3lm7wrsl4aa2abvpq93rdfddfy3nn";
   };
 
-  enableParallelBuilding = true;
+  nativeBuildInputs = [ cmake ];
-
+  buildInputs = [ sqlite libmysqlclient postgresql unixODBC ];
-  buildInputs = [ cmake sqlite libmysqlclient postgresql unixODBC ];
 
   cmakeFlags = [ "--no-warn-unused-cli" ];
   NIX_CFLAGS_COMPILE = "-I${libmysqlclient}/include/mysql -L${libmysqlclient}/lib/mysql";

pkgs/development/libraries/csfml/default.nix

@@ -13,7 +13,8 @@ stdenv.mkDerivation {
     rev   = version;
     sha256 = "071magxif5nrdddzk2z34czqmz1dfws4d7dqynb2zpn7cwhwxcpm";
   };
-  buildInputs = [ cmake sfml ];
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ sfml ];
   cmakeFlags = [ "-DCMAKE_MODULE_PATH=${sfml}/share/SFML/cmake/Modules/" ];
 
   meta = with stdenv.lib; {

pkgs/development/libraries/ctpp2/default.nix

@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "1z22zfw9lb86z4hcan9hlvji49c9b7vznh7gjm95gnvsh43zsgx8";
   };
 
-  buildInputs = [ cmake ];
+  nativeBuildInputs = [ cmake ];
 
   patchPhase = ''
     # include <unistd.h> to fix undefined getcwd

pkgs/development/libraries/curlcpp/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, curl }: 
+{ stdenv, fetchFromGitHub, cmake, curl }:
 
 stdenv.mkDerivation rec {
   pname = "curlcpp";
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
     sha256 = "1zx76jcddqk4zkcdb6p7rsmkjbbjm2cj6drj0c8hdd61ms1d0f3n";
   };
 
-  buildInputs = [ cmake curl ];
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ curl ];
 
   meta = with stdenv.lib; {
     homepage = "https://josephp91.github.io/curlcpp/";
@@ -21,4 +22,3 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ rszibele ];
   };
 }
-

pkgs/development/libraries/embree/2.x.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, ispc, tbb, glfw,
+{ stdenv, fetchFromGitHub, cmake, pkg-config, ispc, tbb, glfw,
 openimageio, libjpeg, libpng, libpthreadstubs, libX11
 }:
 
@@ -14,11 +14,11 @@ stdenv.mkDerivation {
   };
 
   cmakeFlags = [ "-DEMBREE_TUTORIALS=OFF" ];
-  enableParallelBuilding = true;
+
-  
+  nativeBuildInputs = [ cmake pkg-config ];
-  buildInputs = [ pkgconfig cmake ispc tbb glfw openimageio libjpeg libpng libX11 libpthreadstubs ];
+  buildInputs = [ ispc tbb glfw openimageio libjpeg libpng libX11 libpthreadstubs ];
   meta = with stdenv.lib; {
-    description = "High performance ray tracing kernels from Intel"; 
+    description = "High performance ray tracing kernels from Intel";
     homepage = "https://embree.github.io/";
     maintainers = with maintainers; [ hodapp ];
     license = licenses.asl20;

pkgs/development/libraries/flann/default.nix

@@ -18,7 +18,7 @@ stdenv.mkDerivation {
     })
   ];
 
-  buildInputs = [ unzip cmake python ];
+  nativeBuildInputs = [ unzip cmake python ];
 
   meta = {
     homepage = "http://people.cs.ubc.ca/~mariusm/flann/";

pkgs/development/libraries/freeglut/default.nix

@@ -12,7 +12,8 @@ in stdenv.mkDerivation {
 
   outputs = [ "out" "dev" ];
 
-  buildInputs = [ libXi libXrandr libXxf86vm libGL libGLU xlibsWrapper cmake ];
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ libXi libXrandr libXxf86vm libGL libGLU xlibsWrapper ];
 
   cmakeFlags = stdenv.lib.optionals stdenv.isDarwin [
                  "-DOPENGL_INCLUDE_DIR=${libGL}/include"

pkgs/development/libraries/gdcm/default.nix

@@ -28,8 +28,8 @@ stdenv.mkDerivation rec {
     cd ../build
   '';
 
-  enableParallelBuilding = true;
+  nativeBuildInputs = [ cmake ];
-  buildInputs = [ cmake vtk_7 ]
+  buildInputs = [ vtk_7 ]
     ++ stdenv.lib.optional stdenv.isDarwin [
       darwin.apple_sdk.frameworks.ApplicationServices
       darwin.apple_sdk.frameworks.Cocoa

pkgs/development/libraries/glbinding/default.nix

@@ -1,4 +1,5 @@
 { stdenv, fetchFromGitHub, cmake, libGLU, xlibsWrapper }:
+
 stdenv.mkDerivation rec {
   pname = "glbinding";
   version = "3.1.0";
@@ -10,7 +11,8 @@ stdenv.mkDerivation rec {
     sha256 = "1avd7ssms11xx7h0cm8h4pfpk55f07f1j1ybykxfgsym2chb2z08";
   };
 
-  buildInputs = [ cmake libGLU xlibsWrapper ];
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ libGLU xlibsWrapper ];
 
   meta = with stdenv.lib; {
     homepage = "https://github.com/cginternals/glbinding/";

pkgs/development/libraries/google-cloud-cpp/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, clang-tools, grpc, curl, cmake, pkgconfig, fetchFromGitHub, doxygen, protobuf, crc32c, c-ares, fetchurl, openssl, zlib }:
+{ stdenv, clang-tools, grpc, curl, cmake, pkg-config, fetchFromGitHub, doxygen, protobuf, crc32c, c-ares, fetchurl, openssl, zlib }:
 let
   googleapis = fetchFromGitHub {
     owner = "googleapis";
@@ -16,7 +16,7 @@ let
       sha256 = "02zkcq2wl831ayd9qy009xvfx7q80pgycx7mzz9vknwd0nn6dd0n";
     };
 
-    nativeBuildInputs = [ cmake pkgconfig ];
+    nativeBuildInputs = [ cmake pkg-config ];
     buildInputs = [ c-ares c-ares.cmake-config grpc openssl protobuf zlib ];
 
     postPatch = ''
@@ -40,7 +40,7 @@ in stdenv.mkDerivation rec {
   };
 
   buildInputs = [ curl crc32c c-ares c-ares.cmake-config googleapis-cpp-cmakefiles grpc protobuf ];
-  nativeBuildInputs = [ clang-tools cmake pkgconfig doxygen ];
+  nativeBuildInputs = [ clang-tools cmake pkg-config doxygen ];
 
   outputs = [ "out" "dev" ];
 

pkgs/development/libraries/grantlee/default.nix

@@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
     sha256 = "1b501xbimizmbmysl1j5zgnp48qw0r2r7lhgmxvzhzlv9jzhj60r";
   };
 
-  buildInputs = [ cmake qt4 ];
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ qt4 ];
 
   meta = {
     description = "Qt4 port of Django template system";

pkgs/development/libraries/grib-api/default.nix

@@ -23,9 +23,8 @@ stdenv.mkDerivation rec {
     substituteInPlace "src/grib_jasper_encoding.c" --replace "image.inmem_    = 1;" ""
   '';
 
-  buildInputs = [ cmake
+  nativeBuildInputs = [ cmake gfortran ];
-                  netcdf
+  buildInputs = [ netcdf
-                  gfortran
                   libpng
                   openjpeg
                 ] ++ stdenv.lib.optionals enablePython [
@@ -42,8 +41,6 @@ stdenv.mkDerivation rec {
                  "-DOPENJPEG_INCLUDE_DIR=${openjpeg.dev}/include/${openjpeg.incDir}"
                ];
 
-  enableParallelBuilding = true;
-
   doCheck = true;
 
   # Only do tests that don't require downloading 120MB of testdata

pkgs/development/libraries/grpc/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, cmake, zlib, c-ares, pkgconfig, openssl, protobuf
+{ stdenv, fetchFromGitHub, fetchpatch, cmake, zlib, c-ares, pkg-config, openssl, protobuf
 , gflags, abseil-cpp, libnsl
 }:
 
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  nativeBuildInputs = [ cmake pkgconfig ];
+  nativeBuildInputs = [ cmake pkg-config ];
   buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags abseil-cpp ]
     ++ stdenv.lib.optionals stdenv.isLinux [ libnsl ];
 

pkgs/development/libraries/hpx/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, boost, cmake, hwloc, gperftools, pkgconfig, python }:
+{ stdenv, fetchFromGitHub, boost, cmake, hwloc, gperftools, pkg-config, python }:
 
 stdenv.mkDerivation rec {
   pname = "hpx";
@@ -12,9 +12,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ boost hwloc gperftools ];
-  nativeBuildInputs = [ cmake pkgconfig python ];
+  nativeBuildInputs = [ cmake pkg-config python ];
-
-  enableParallelBuilding = true;
 
   meta = {
     description = "C++ standard library for concurrency and parallelism";

pkgs/development/libraries/libLAS/default.nix

@@ -4,13 +4,12 @@ stdenv.mkDerivation rec {
   name = "libLAS-1.8.1";
 
   src = fetchurl {
-
     url = "https://download.osgeo.org/liblas/${name}.tar.bz2";
     sha256 = "0xjfxb3ydvr2258ji3spzyf81g9caap19ql2pk91wiivqsc4mnws";
   };
 
-  nativeBuildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
+  nativeBuildInputs = [ cmake ] ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
-  buildInputs = [ boost cmake gdal libgeotiff libtiff LASzip2 ];
+  buildInputs = [ boost gdal libgeotiff libtiff LASzip2 ];
 
   cmakeFlags = [
     "-DGDAL_CONFIG=${gdal}/bin/gdal-config"

pkgs/development/libraries/libbladeRF/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, pkgconfig, cmake, git, doxygen, help2man, ncurses, tecla
+{ stdenv, lib, fetchFromGitHub, pkg-config, cmake, git, doxygen, help2man, ncurses, tecla
 , libusb1, udev }:
 
 let
@@ -23,9 +23,9 @@ in stdenv.mkDerivation {
     sha256 = "0g89al4kwfbx1l3zjddgb9ay4mhr7zk0ndchca3sm1vq2j47nf4l";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ cmake pkg-config git doxygen help2man ];
   # ncurses used due to https://github.com/Nuand/bladeRF/blob/ab4fc672c8bab4f8be34e8917d3f241b1d52d0b8/host/utilities/bladeRF-cli/CMakeLists.txt#L208
-  buildInputs = [ cmake git doxygen help2man tecla libusb1 ]
+  buildInputs = [ tecla libusb1 ]
     ++ lib.optionals stdenv.isLinux [ udev ]
     ++ lib.optionals stdenv.isDarwin [ ncurses ];
 

pkgs/development/libraries/libbluedevil/default.nix

@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
     sha256 = "0p4f0brhcz9gfxfd6114fa5x6swfdmgzv350xwncdr0s1qnamk8c";
   };
 
-  buildInputs = [ cmake qt4 ];
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ qt4 ];
 
   meta = {
     platforms = stdenv.lib.platforms.unix;

pkgs/development/libraries/libdynd/default.nix

@@ -26,7 +26,7 @@ stdenv.mkDerivation {
     "-Wno-error=deprecated-copy"
   ];
 
-  buildInputs = [ cmake ];
+  nativeBuildInputs = [ cmake ];
 
   outputs = [ "out" "dev" ];
   outputDoc = "dev";

pkgs/development/libraries/libebur128/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, speexdsp, pkgconfig }:
+{ stdenv, fetchFromGitHub, cmake, speexdsp, pkg-config }:
 
 stdenv.mkDerivation rec {
   version = "1.2.4";
@@ -11,8 +11,8 @@ stdenv.mkDerivation rec {
     sha256 = "0n81rnm8dm1zmibkr2v3q79rsd609y0dbbsrbay18njcjva88p0g";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ cmake pkg-config ];
-  buildInputs = [ cmake speexdsp ];
+  buildInputs = [ speexdsp ];
 
   meta = with stdenv.lib; {
     description = "Implementation of the EBU R128 loudness standard";

pkgs/development/libraries/libgroove/default.nix

@@ -13,7 +13,8 @@ stdenv.mkDerivation rec {
 
   patches = [ ./no-warnings-as-errors.patch ];
 
-  buildInputs = [ cmake libav SDL2 chromaprint libebur128 ];
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ libav SDL2 chromaprint libebur128 ];
 
   meta = with stdenv.lib; {
     description = "Streaming audio processing library";

pkgs/development/libraries/libharu/default.nix

@@ -8,7 +8,8 @@ stdenv.mkDerivation {
     sha256 = "15s9hswnl3qqi7yh29jyrg0hma2n99haxznvcywmsp8kjqlyg75q";
   };
 
-  buildInputs = [ zlib libpng cmake ];
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ zlib libpng ];
 
   meta = {
     description = "Cross platform, open source library for generating PDF files";