pkgs/tools: pkgconfig -> pkg-config (2)

pkgs/tools/X11/alttab/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, autoconf, automake, pkgconfig, ronn, libpng, uthash
+{ lib, stdenv, fetchFromGitHub, autoconf, automake, pkg-config, ronn, libpng, uthash
 , xorg }:
 
 stdenv.mkDerivation rec {
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ 
     autoconf
     automake
-    pkgconfig
+    pkg-config
     ronn
   ];
 

pkgs/tools/X11/bgs/default.nix

@@ -1,4 +1,4 @@
-{lib, stdenv, fetchurl, pkgconfig, libX11, libXinerama, imlib2}:
+{lib, stdenv, fetchurl, pkg-config, libX11, libXinerama, imlib2}:
 
 stdenv.mkDerivation rec {
 
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "1rw9ingkkpvvr2dixx126ziim67a54r8k49918h1mbph0fjj08n5";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [ libX11 libXinerama imlib2 ];
 

pkgs/tools/X11/bumblebee/default.nix

@@ -16,7 +16,7 @@
 #
 # To use at startup, see hardware.bumblebee options.
 
-{ stdenv, lib, fetchurl, fetchpatch, pkgconfig, help2man, makeWrapper
+{ stdenv, lib, fetchurl, fetchpatch, pkg-config, help2man, makeWrapper
 , glib, libbsd
 , libX11, xorgserver, kmod, xf86videonouveau
 , nvidia_x11, virtualgl, libglvnd
@@ -103,7 +103,7 @@ in stdenv.mkDerivation rec {
   # Build-time dependencies of bumblebeed and optirun.
   # Note that it has several runtime dependencies.
   buildInputs = [ libX11 glib libbsd kmod ];
-  nativeBuildInputs = [ makeWrapper pkgconfig help2man automake111x autoconf ];
+  nativeBuildInputs = [ makeWrapper pkg-config help2man automake111x autoconf ];
 
   # The order of LDPATH is very specific: First X11 then the host
   # environment then the optional sub architecture paths.

pkgs/tools/X11/dragon-drop/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, gtk, pkgconfig, fetchFromGitHub }:
+{ lib, stdenv, gtk, pkg-config, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   pname = "dragon-drop";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "0fgzz39007fdjwq72scp0qygp2v3zc5f1xkm0sxaa8zxm25g1bra";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ gtk ];
 
   installPhase = ''

pkgs/tools/X11/keynav/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, pkgconfig, libX11, xorgproto, libXtst, libXi, libXext
+{ lib, stdenv, fetchFromGitHub, pkg-config, libX11, xorgproto, libXtst, libXi, libXext
 , libXinerama, libXrandr, glib, cairo, xdotool }:
 
 let release = "20180821"; in
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
     sha256 = "0hmc14fj612z5h7gjgk95zyqab3p35c4a99snnblzxfg0p3x2f1d";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ libX11 xorgproto libXtst libXi libXext libXinerama libXrandr
                   glib cairo xdotool ];
 

pkgs/tools/X11/ksuperkey/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, libX11, libXtst, pkgconfig, xorgproto, libXi }:
+{ lib, stdenv, fetchFromGitHub, libX11, libXtst, pkg-config, xorgproto, libXi }:
 
 stdenv.mkDerivation rec {
   pname = "ksuperkey";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   makeFlags = [ "PREFIX=${placeholder "out"}" ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ libX11 libXtst xorgproto libXi ];
 
   meta = with lib; {

pkgs/tools/X11/nitrogen/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkgconfig, glib, gtkmm2 }:
+{ lib, stdenv, fetchurl, pkg-config, glib, gtkmm2 }:
 
 let version = "1.6.1";
 in
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "0zc3fl1mbhq0iyndy4ysmy8vv5c7xwf54rbgamzfhfvsgdq160pl";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [ glib gtkmm2 ];
 

pkgs/tools/X11/nx-libs/default.nix

@@ -1,5 +1,5 @@
 { lib, stdenv, autoconf, automake, fetchFromGitHub, libgcc, libjpeg_turbo
-, libpng, libtool, libxml2, pkgconfig, which, xorg
+, libpng, libtool, libxml2, pkg-config, which, xorg
 , libtirpc
 }:
 stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     sha256 = "01aqdwy0i4nxdyfa24bwnrqjz93q0idihdaqals2yjqpg160nwfc";
   };
 
-  nativeBuildInputs = [ autoconf automake libtool pkgconfig which
+  nativeBuildInputs = [ autoconf automake libtool pkg-config which
     xorg.gccmakedep xorg.imake ];
   buildInputs = [ libgcc libjpeg_turbo libpng libxml2 xorg.fontutil
     xorg.libXcomposite xorg.libXdamage xorg.libXdmcp xorg.libXext xorg.libXfont2

pkgs/tools/X11/obconf/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkgconfig, gtk2, libglade, openbox,
+{ lib, stdenv, fetchurl, pkg-config, gtk2, libglade, openbox,
   imlib2, libstartup_notification, makeWrapper, libSM }:
 
 stdenv.mkDerivation rec {
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "1fanjdmd8727kk74x5404vi8v7s4kpq48l583d12fsi4xvsfb8vi";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [
     gtk2 libglade libSM openbox imlib2 libstartup_notification
     makeWrapper

pkgs/tools/X11/runningx/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkgconfig, libX11 }:
+{ lib, stdenv, fetchurl, pkg-config, libX11 }:
 
 stdenv.mkDerivation {
   pname = "runningx";
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
     sha256 = "1mikkhrx6jsx716041qdy3nwjac08pxxvxyq2yablm8zg9hrip0d";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [ libX11 ];
 

pkgs/tools/X11/screen-message/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, autoreconfHook, pkgconfig, gtk3 }:
+{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, gtk3 }:
 
 stdenv.mkDerivation rec {
   pname = "screen-message";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "1lw955qq5pq010lzmaf32ylj2iprgsri9ih4hx672c3f794ilab0";
   };
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook pkg-config ];
   buildInputs = [ gtk3 ];
 
   # screen-message installs its binary in $(prefix)/games per default

pkgs/tools/X11/skippy-xd/default.nix

@@ -1,10 +1,10 @@
 {lib, stdenv, fetchgit, xorgproto, libX11, libXft, libXcomposite, libXdamage
-, libXext, libXinerama, libjpeg, giflib, pkgconfig
+, libXext, libXinerama, libjpeg, giflib, pkg-config
 }:
 let
   buildInputs = [
     xorgproto libX11 libXft libXcomposite libXdamage libXext
-    libXinerama libjpeg giflib pkgconfig
+    libXinerama libjpeg giflib pkg-config
   ];
 in
 stdenv.mkDerivation rec {

pkgs/tools/X11/vdpauinfo/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkgconfig, libvdpau }:
+{ lib, stdenv, fetchurl, pkg-config, libvdpau }:
 
 stdenv.mkDerivation rec {
   pname = "vdpauinfo";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "0s6jdadnycyd1agsnfx7hrf17hmipasx1fpmppd4m1z6i9sp1i6g";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ libvdpau ];
 
   meta = with lib; {

pkgs/tools/X11/wmctrl/default.nix

@@ -2,7 +2,7 @@
 , fetchurl
 , libX11
 , glib
-, pkgconfig
+, pkg-config
 , libXmu
 }:
 
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     sha256 = "1afclc57b9017a73mfs9w7lbdvdipmf9q0xdk116f61gnvyix2np";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ libX11 libXmu glib ];
 
   patches = [ ./64-bit-data.patch ];

pkgs/tools/X11/x11spice/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitLab, autoreconfHook, pkgconfig
+{ lib, stdenv, fetchFromGitLab, autoreconfHook, pkg-config
 , xorg, gtk2, spice, spice-protocol
 }:
 
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
     sha256 = "0va5ix14vnqch59gq8wvrhw6q0w0n27sy70xx5kvfj2cl0h1xpg8";
   };
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook pkg-config ];
 
   buildInputs = [
     xorg.libxcb xorg.xcbutil xorg.utilmacros

pkgs/tools/X11/x11vnc/default.nix

@@ -1,6 +1,6 @@
 { lib, stdenv, fetchFromGitHub, fetchpatch,
   openssl, zlib, libjpeg, xorg, coreutils, libvncserver,
-  autoreconfHook, pkgconfig }:
+  autoreconfHook, pkg-config }:
 
 stdenv.mkDerivation rec {
   pname = "x11vnc";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook pkg-config ];
 
   buildInputs =
     [ xorg.libXfixes xorg.xorgproto openssl xorg.libXdamage

pkgs/tools/X11/xautomation/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkgconfig, libpng, libX11, libXext, libXi, libXtst }:
+{ lib, stdenv, fetchurl, pkg-config, libpng, libX11, libXext, libXi, libXtst }:
 
 let version = "1.09"; in
 stdenv.mkDerivation {
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
     sha256 = "03azv5wpg65h40ip2kk1kdh58vix4vy1r9bihgsq59jx2rhjr3zf";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ libpng libX11 libXext libXi libXtst ];
 
   meta = {

pkgs/tools/X11/xbindkeys-config/default.nix

@@ -1,10 +1,10 @@
-{ lib, stdenv, fetchurl, gtk, pkgconfig, procps, makeWrapper, ... }:
+{ lib, stdenv, fetchurl, gtk, pkg-config, procps, makeWrapper, ... }:
 
 stdenv.mkDerivation rec {
   pname = "xbindkeys-config";
   version = "0.1.3";
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ gtk makeWrapper ];
 
   src = fetchurl {

pkgs/tools/X11/xbindkeys/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkgconfig, libX11, guile }:
+{ lib, stdenv, fetchurl, pkg-config, libX11, guile }:
 
 let version = "1.8.7"; in
 stdenv.mkDerivation {
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
     sha256 = "1wl2vc5alisiwyk8m07y1ryq8w3ll9ym83j27g4apm4ixjl8d6x2";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ libX11 guile ];
 
   meta = {

pkgs/tools/X11/xcape/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, pkgconfig, libX11, libXtst, xorgproto,
+{ lib, stdenv, fetchFromGitHub, pkg-config, libX11, libXtst, xorgproto,
 libXi }:
 
 stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     sha256 = "04grs4w9kpfzz25mqw82zdiy51g0w355gpn5b170p7ha5972ykc8";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [ libX11 libXtst xorgproto libXi ];
 

pkgs/tools/X11/xdotool/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkgconfig, libX11, perl, libXtst, xorgproto, libXi, libXinerama, libxkbcommon }:
+{ lib, stdenv, fetchurl, pkg-config, libX11, perl, libXtst, xorgproto, libXi, libXinerama, libxkbcommon }:
 
 stdenv.mkDerivation rec {
   pname = "xdotool";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "1a6c1zr86zb53352yxv104l76l8x21gfl2bgw6h21iphxpv5zgim";
   };
 
-  nativeBuildInputs = [ pkgconfig perl ];
+  nativeBuildInputs = [ pkg-config perl ];
   buildInputs = [ libX11 libXtst xorgproto libXi libXinerama libxkbcommon ];
 
   preBuild = ''

pkgs/tools/X11/xidlehook/default.nix

@@ -1,5 +1,5 @@
 { lib, stdenv, rustPlatform, fetchFromGitLab, python3
-, xlibsWrapper, xorg, libpulseaudio, pkgconfig, patchelf, Security }:
+, xlibsWrapper, xorg, libpulseaudio, pkg-config, patchelf, Security }:
 
 rustPlatform.buildRustPackage rec {
   pname = "xidlehook";
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
   cargoSha256 = "050ihjhg33223x6pgvhqrjprx1clkj2x3jr6acf716vbwm3m0bmz";
 
   buildInputs = [ xlibsWrapper xorg.libXScrnSaver libpulseaudio ] ++ lib.optional stdenv.isDarwin Security;
-  nativeBuildInputs = [ pkgconfig patchelf python3 ];
+  nativeBuildInputs = [ pkg-config patchelf python3 ];
 
   postFixup = lib.optionalString stdenv.isLinux ''
     RPATH="$(patchelf --print-rpath $out/bin/xidlehook)"

pkgs/tools/X11/xinput_calibrator/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, libXi, xorgproto, autoconf, automake, libtool, m4, xlibsWrapper, pkgconfig }:
+{ lib, stdenv, fetchurl, libXi, xorgproto, autoconf, automake, libtool, m4, xlibsWrapper, pkg-config }:
 
 stdenv.mkDerivation rec {
   pname = "xinput_calibrator";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   preConfigure = "./autogen.sh --with-gui=X11";
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ xorgproto libXi autoconf automake libtool m4 xlibsWrapper ];
 
   meta = {

pkgs/tools/X11/xmousepasteblock/default.nix

@@ -1,4 +1,4 @@
-{ xorg, lib, stdenv, libev, fetchFromGitHub, pkgconfig }:
+{ xorg, lib, stdenv, libev, fetchFromGitHub, pkg-config }:
 
 stdenv.mkDerivation rec {
   pname = "xmousepasteblock";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   };
   makeFlags = "PREFIX=$(out)";
   buildInputs = with xorg; [ libX11 libXext libXi libev ];
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   meta = with lib; {
     description = "Middle mouse button primary X selection/clipboard paste disabler";
     homepage = "https://github.com/milaq/XMousePasteBlock";

pkgs/tools/X11/xnee/default.nix

@@ -1,5 +1,5 @@
 { fetchurl, lib, stdenv, libX11, xorgproto, libXext, libXtst
-, gtk2, libXi, pkgconfig, texinfo }:
+, gtk2, libXi, pkg-config, texinfo }:
 
 stdenv.mkDerivation rec {
   version = "3.19";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   buildInputs =
     [ libX11 xorgproto libXext libXtst gtk2
-      libXi pkgconfig
+      libXi pkg-config
       texinfo
     ];
 

pkgs/tools/X11/xpra/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, callPackage, substituteAll, python3, pkgconfig, writeText
+{ stdenv, lib, fetchurl, callPackage, substituteAll, python3, pkg-config, writeText
 , xorg, gtk3, glib, pango, cairo, gdk-pixbuf, atk
 , wrapGAppsHook, xorgserver, getopt, xauth, util-linux, which
 , ffmpeg, x264, libvpx, libwebp, x265
@@ -50,7 +50,7 @@ in buildPythonApplication rec {
     substituteInPlace setup.py --replace '/usr/include/security' '${pam}/include/security'
   '';
 
-  nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
+  nativeBuildInputs = [ pkg-config wrapGAppsHook ];
   buildInputs = with xorg; [
     libX11 xorgproto libXrender libXi
     libXtst libXfixes libXcomposite libXdamage

pkgs/tools/X11/xprintidle-ng/default.nix

@@ -1,5 +1,5 @@
 { lib, stdenv, fetchFromGitHub, libX11, libXScrnSaver, libXext, gnulib
-  , autoconf, automake, libtool, gettext, pkgconfig
+  , autoconf, automake, libtool, gettext, pkg-config
   , git, perl, texinfo, help2man
 }:
 
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     autoconf automake gettext git gnulib
-    help2man libtool perl pkgconfig texinfo
+    help2man libtool perl pkg-config texinfo
   ];
 
   configurePhase = ''

pkgs/tools/X11/xrestop/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, xorg, pkgconfig, ncurses }:
+{ lib, stdenv, fetchurl, xorg, pkg-config, ncurses }:
 stdenv.mkDerivation {
 
   pname = "xrestop";
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
     sha256 = "0mz27jpij8am1s32i63mdm58znfijcpfhdqq1npbmvgclyagrhk7";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ xorg.libX11 xorg.libXres xorg.libXext ncurses ];
 
   meta = {

pkgs/tools/X11/xsecurelock/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config
 , libX11, libXcomposite, libXft, libXmu, libXrandr, libXext, libXScrnSaver
 , pam, apacheHttpd, pamtester, xscreensaver }:
 
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    autoreconfHook pkgconfig
+    autoreconfHook pkg-config
   ];
   buildInputs = [
     libX11 libXcomposite libXft libXmu libXrandr libXext libXScrnSaver

pkgs/tools/X11/xsettingsd/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, scons, pkgconfig, libX11 }:
+{ lib, stdenv, fetchFromGitHub, scons, pkg-config, libX11 }:
 
 stdenv.mkDerivation rec {
   pname = "xsettingsd";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     ./SConstruct.patch
   ];
 
-  nativeBuildInputs = [ scons pkgconfig ];
+  nativeBuildInputs = [ scons pkg-config ];
 
   buildInputs = [ libX11 ];
 

pkgs/tools/X11/xwinmosaic/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, gtk2, cmake, pkgconfig, libXdamage }:
+{ lib, stdenv, fetchFromGitHub, gtk2, cmake, pkg-config, libXdamage }:
 
 stdenv.mkDerivation rec {
   version = "0.4.2";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "16qhrpgn84fz0q3nfvaz5sisc82zk6y7c0sbvbr69zfx5fwbs1rr";
   };
 
-  nativeBuildInputs = [ pkgconfig cmake ];
+  nativeBuildInputs = [ pkg-config cmake ];
   buildInputs = [ gtk2 libXdamage ];
 
   meta = {

pkgs/tools/admin/gtk-vnc/default.nix

@@ -7,7 +7,7 @@
 , gnutls
 , cairo
 , glib
-, pkgconfig
+, pkg-config
 , cyrus_sasl
 , libpulseaudio
 , libgcrypt
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     meson
     ninja
-    pkgconfig
+    pkg-config
     gobject-introspection
     vala
     gettext

pkgs/tools/admin/intecture/agent.nix

@@ -1,5 +1,5 @@
 { lib, fetchFromGitHub, rustPlatform
-, openssl, zeromq, czmq, pkgconfig, cmake, zlib }:
+, openssl, zeromq, czmq, pkg-config, cmake, zlib }:
 
 with rustPlatform;
 
@@ -18,7 +18,7 @@ buildRustPackage rec {
 
   buildInputs = [ openssl zeromq czmq zlib ];
 
-  nativeBuildInputs = [ pkgconfig cmake ];
+  nativeBuildInputs = [ pkg-config cmake ];
 
   meta = with lib; {
     description = "Authentication client/server for Intecture components";

pkgs/tools/admin/intecture/auth.nix

@@ -1,5 +1,5 @@
 { lib, fetchFromGitHub, rustPlatform
-, openssl, zeromq, czmq, pkgconfig, cmake, zlib }:
+, openssl, zeromq, czmq, pkg-config, cmake, zlib }:
 
 with rustPlatform;
 
@@ -18,7 +18,7 @@ buildRustPackage rec {
 
   buildInputs = [ openssl zeromq czmq zlib ];
 
-  nativeBuildInputs = [ pkgconfig cmake ];
+  nativeBuildInputs = [ pkg-config cmake ];
 
   meta = with lib; {
     description = "Authentication client/server for Intecture components";

pkgs/tools/admin/intecture/cli.nix

@@ -1,5 +1,5 @@
 { lib, fetchFromGitHub, rustPlatform
-, openssl, zeromq, czmq, pkgconfig, cmake, zlib }:
+, openssl, zeromq, czmq, pkg-config, cmake, zlib }:
 
 with rustPlatform;
 
@@ -18,7 +18,7 @@ buildRustPackage rec {
 
   buildInputs = [ openssl zeromq czmq zlib ];
 
-  nativeBuildInputs = [ pkgconfig cmake ];
+  nativeBuildInputs = [ pkg-config cmake ];
 
   # Needed for tests
   USER = "$(whoami)";

pkgs/tools/admin/lxd/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, hwdata, pkgconfig, lxc, buildGoPackage, fetchurl
+{ lib, stdenv, hwdata, pkg-config, lxc, buildGoPackage, fetchurl
 , makeWrapper, acl, rsync, gnutar, xz, btrfs-progs, gzip, dnsmasq
 , squashfsTools, iproute, iptables, ebtables, iptables-nftables-compat, libcap
 , libco-canonical, dqlite, raft-canonical, sqlite-replication, udev
@@ -58,7 +58,7 @@ buildGoPackage rec {
     installShellCompletion --bash go/src/github.com/lxc/lxd/scripts/bash/lxd-client
   '';
 
-  nativeBuildInputs = [ installShellFiles pkgconfig makeWrapper ];
+  nativeBuildInputs = [ installShellFiles pkg-config makeWrapper ];
   buildInputs = [ lxc acl libcap libco-canonical.dev dqlite.dev
                   raft-canonical.dev sqlite-replication udev.dev ];
 

pkgs/tools/archivers/cromfs/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkgconfig, fuse, perl }:
+{ lib, stdenv, fetchurl, pkg-config, fuse, perl }:
 
 stdenv.mkDerivation rec {
   name = "cromfs-1.5.10.2";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     install util/unmkcromfs $out/bin
   '';
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ fuse perl ];
 
   meta = with lib; {

pkgs/tools/archivers/fsarchiver/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config
 , zlib, bzip2, lzma, lzo, lz4, zstd, xz
 , libgcrypt, e2fsprogs, util-linux, libgpgerror }:
 
@@ -17,7 +17,7 @@ in stdenv.mkDerivation {
   };
 
   nativeBuildInputs = [
-    autoreconfHook pkgconfig
+    autoreconfHook pkg-config
   ];
 
   buildInputs = [

pkgs/tools/audio/abcm2ps/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, pkgconfig, which, docutils, freetype, pango }:
+{ lib, stdenv, fetchFromGitHub, pkg-config, which, docutils, freetype, pango }:
 
 stdenv.mkDerivation rec {
   pname = "abcm2ps";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     "CC=${stdenv.cc}/bin/cc"
   ];
 
-  nativeBuildInputs = [ which pkgconfig docutils ];
+  nativeBuildInputs = [ which pkg-config docutils ];
 
   buildInputs = [ freetype pango ];
 

pkgs/tools/audio/darkice/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkgconfig
+{ lib, stdenv, fetchurl, pkg-config
 , libjack2, alsaLib, libpulseaudio
 , faac, lame, libogg, libopus, libvorbis, libsamplerate
 }:
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     sha256 = "1rlxds7ssq7nk2in4s46xws7xy9ylxsqgcz85hxjgh17lsm0y39c";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [
     libopus libvorbis libogg libpulseaudio alsaLib libsamplerate libjack2 lame
   ];

pkgs/tools/audio/ezstream/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, libiconv, libshout, taglib, libxml2, pkgconfig }:
+{ lib, stdenv, fetchurl, libiconv, libshout, taglib, libxml2, pkg-config }:
 
 stdenv.mkDerivation rec {
   pname = "ezstream";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ libiconv libshout taglib libxml2 ];
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
 
   doCheck = true;
 

pkgs/tools/audio/glyr/default.nix

@@ -1,5 +1,5 @@
 { lib, stdenv, fetchFromGitHub, cmake
-, curl, glib, sqlite, pkgconfig }:
+, curl, glib, sqlite, pkg-config }:
 
 stdenv.mkDerivation rec {
   version = "1.0.10";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     sha256 = "1miwbqzkhg0v3zysrwh60pj9sv6ci4lzq2vq2hhc6pc6hdyh8xyr";
   };
 
-  nativeBuildInputs = [ cmake pkgconfig ];
+  nativeBuildInputs = [ cmake pkg-config ];
   buildInputs = [ sqlite glib curl ];
 
   meta = with lib; {

pkgs/tools/audio/gvolicon/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, makeWrapper, alsaLib, pkgconfig, fetchgit, gtk3, gnome3, gdk-pixbuf, librsvg, wrapGAppsHook }:
+{ lib, stdenv, makeWrapper, alsaLib, pkg-config, fetchgit, gtk3, gnome3, gdk-pixbuf, librsvg, wrapGAppsHook }:
 
 stdenv.mkDerivation {
   name = "gvolicon-2014-04-28";
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
     sha256 = "1sr9wyy7w898vq63yd003yp3k66hd4vm8b0qsm9zvmwmpiz4wvln";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [
     makeWrapper alsaLib gtk3 gdk-pixbuf gnome3.adwaita-icon-theme
     librsvg wrapGAppsHook

pkgs/tools/audio/liquidsoap/full.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, makeWrapper, fetchurl, which, pkgconfig
+{ lib, stdenv, makeWrapper, fetchurl, which, pkg-config
 , ocamlPackages
 , libao, portaudio, alsaLib, libpulseaudio, libjack2
 , libsamplerate, libmad, taglib, lame, libogg
@@ -49,7 +49,7 @@ stdenv.mkDerivation {
 
   configureFlags = [ "--localstatedir=/var" ];
 
-  nativeBuildInputs = [ makeWrapper pkgconfig ];
+  nativeBuildInputs = [ makeWrapper pkg-config ];
   buildInputs =
     [ which ocamlPackages.ocaml ocamlPackages.findlib
       libao portaudio alsaLib libpulseaudio libjack2

pkgs/tools/audio/mpdas/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, pkgconfig, mpd_clientlib, curl }:
+{ lib, stdenv, fetchFromGitHub, pkg-config, mpd_clientlib, curl }:
 
 stdenv.mkDerivation rec {
   pname = "mpdas";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "0fcqc4w6iwbi1n3cllcgj0k61zffhqkbr8668myxap21m35x8y1r";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [ mpd_clientlib curl ];
 

pkgs/tools/audio/mpdcron/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, glib, libdaemon
+{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, glib, libdaemon
 , mpd_clientlib, curl, sqlite, bundlerEnv, libnotify, pandoc }:
 
 let
@@ -26,7 +26,7 @@ in stdenv.mkDerivation {
   };
 
   buildInputs =
-    [ autoconf automake libtool pkgconfig glib libdaemon pandoc
+    [ autoconf automake libtool pkg-config glib libdaemon pandoc
       mpd_clientlib curl sqlite gemEnv.wrappedRuby libnotify ];
 
   preConfigure = ''

pkgs/tools/audio/pa-applet/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchgit, libpulseaudio, pkgconfig, gtk3, glibc, autoconf, automake, libnotify, libX11, xf86inputevdev }:
+{ lib, stdenv, fetchgit, libpulseaudio, pkg-config, gtk3, glibc, autoconf, automake, libnotify, libX11, xf86inputevdev }:
 
 stdenv.mkDerivation {
   name = "pa-applet-2012-04-11";
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
     sha256 = "1242sdri67wnm1cd0hr40mxarkh7qs7mb9n2m0g9dbz0f4axj6wa";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [
     gtk3 libpulseaudio glibc automake autoconf libnotify libX11 xf86inputevdev
   ];

pkgs/tools/audio/pasystray/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchpatch, fetchFromGitHub, pkgconfig, autoreconfHook, wrapGAppsHook
+{ lib, stdenv, fetchpatch, fetchFromGitHub, pkg-config, autoreconfHook, wrapGAppsHook
 , gnome3, avahi, gtk3, libayatana-appindicator-gtk3, libnotify, libpulseaudio
 , xlibsWrapper, gsettings-desktop-schemas
 }:
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  nativeBuildInputs = [ pkgconfig autoreconfHook wrapGAppsHook ];
+  nativeBuildInputs = [ pkg-config autoreconfHook wrapGAppsHook ];
   buildInputs = [
     gnome3.adwaita-icon-theme
     avahi gtk3 libayatana-appindicator-gtk3 libnotify libpulseaudio xlibsWrapper

pkgs/tools/audio/playerctl/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, meson, ninja, fetchFromGitHub, glib, pkgconfig, gtk-doc, docbook_xsl, gobject-introspection }:
+{ lib, stdenv, meson, ninja, fetchFromGitHub, glib, pkg-config, gtk-doc, docbook_xsl, gobject-introspection }:
 
 stdenv.mkDerivation rec {
   pname = "playerctl";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "00z5c6amlxd3q42l7x8i0ngl627dxglgg5vikbbhjp9ms34xbxdn";
   };
 
-  nativeBuildInputs = [ meson ninja pkgconfig gtk-doc docbook_xsl gobject-introspection ];
+  nativeBuildInputs = [ meson ninja pkg-config gtk-doc docbook_xsl gobject-introspection ];
   buildInputs = [ glib ];
 
   mesonFlags = [ "-Dbash-completions=true" ];

pkgs/tools/audio/pnmixer/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, gettext, alsaLib, gtk3, glib, libnotify, libX11, pcre }:
+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, gettext, alsaLib, gtk3, glib, libnotify, libX11, pcre }:
 
 stdenv.mkDerivation rec {
   pname = "pnmixer";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "0416pa933ddf4b7ph9zxhk5jppkk7ppcq1aqph6xsrfnka4yb148";
   };
 
-  nativeBuildInputs = [ cmake pkgconfig gettext ];
+  nativeBuildInputs = [ cmake pkg-config gettext ];
 
   buildInputs = [ alsaLib gtk3 glib libnotify libX11 pcre ];
 

pkgs/tools/audio/volumeicon/default.nix

@@ -1,4 +1,4 @@
-{ pkgs, fetchurl, lib, stdenv, gtk3, pkgconfig, intltool, alsaLib }:
+{ pkgs, fetchurl, lib, stdenv, gtk3, pkg-config, intltool, alsaLib }:
 
 stdenv.mkDerivation {
   pname = "volumeicon";
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
     sha256 = "182xl2w8syv6ky2h2bc9imc6ap8pzh0p7rp63hh8nw0xm38c3f14";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ gtk3 intltool alsaLib ];
 
   meta = with lib; {

pkgs/tools/backup/bareos/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, pkgconfig, nettools, gettext, flex
+{ lib, stdenv, fetchFromGitHub, pkg-config, nettools, gettext, flex
 , readline ? null, openssl ? null, python2 ? null, ncurses ? null, rocksdb
 , sqlite ? null, postgresql ? null, libmysqlclient ? null, zlib ? null, lzo ? null
 , jansson ? null, acl ? null, glusterfs ? null, libceph ? null, libcap ? null
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     sha256 = "1awf5i4mw2nfd7z0dmqnywapnx9nz6xwqv8rxp0y2mnrhzdpbrbz";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [
     nettools gettext readline openssl python2 flex ncurses sqlite postgresql
     libmysqlclient zlib lzo jansson acl glusterfs libceph libcap rocksdb

pkgs/tools/backup/burp/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config
 , acl, librsync, ncurses, openssl, zlib, uthash }:
 
 stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     sha256 = "1zhq240kz881vs2s620qp0kifmgr582caalm85ls789w9rmdkhjl";
   };
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook pkg-config ];
   buildInputs = [ librsync ncurses openssl zlib uthash ]
     ++ lib.optional (!stdenv.isDarwin) acl;
 

pkgs/tools/backup/dump/default.nix

@@ -1,7 +1,7 @@
 # Tested with simple dump and restore -i, but complains that
 # /nix/store/.../etc/dumpdates doesn't exist.
 
-{ lib, stdenv, fetchurl, pkgconfig,
+{ lib, stdenv, fetchurl, pkg-config,
   e2fsprogs, ncurses, readline }:
 
 stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     sha256 = "15rg5y15ak0ppqlhcih78layvg7cwp6hc16p3c58xs8svlkxjqc0";
   };
 
-  buildInputs = [ e2fsprogs pkgconfig ncurses readline ];
+  buildInputs = [ e2fsprogs pkg-config ncurses readline ];
 
   meta = with lib; {
     homepage = "https://dump.sourceforge.io/";

pkgs/tools/backup/hpe-ltfs/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, fuse, icu, pkgconfig, libxml2, libuuid }:
+{ lib, stdenv, fetchFromGitHub, fuse, icu, pkg-config, libxml2, libuuid }:
 
 stdenv.mkDerivation rec {
   version = "3.4.2_Z7550-02501";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   sourceRoot = "source/ltfs";
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [ 
     fuse icu libxml2 libuuid

pkgs/tools/backup/httrack/qt.nix

@@ -1,4 +1,4 @@
-{ mkDerivation, lib, stdenv, fetchurl, cmake, pkgconfig, makeWrapper
+{ mkDerivation, lib, stdenv, fetchurl, cmake, pkg-config, makeWrapper
 , httrack, qtbase, qtmultimedia }:
 
 mkDerivation rec {
@@ -12,7 +12,7 @@ mkDerivation rec {
 
   buildInputs = [ httrack qtbase qtmultimedia ];
 
-  nativeBuildInputs = [ cmake makeWrapper pkgconfig ];
+  nativeBuildInputs = [ cmake makeWrapper pkg-config ];
 
   prePatch = ''
     substituteInPlace cmake/HTTRAQTFindHttrack.cmake \

pkgs/tools/backup/luckybackup/default.nix

@@ -1,5 +1,5 @@
 { mkDerivation, lib, stdenv, fetchurl
-, pkgconfig, libtool, qmake
+, pkg-config, libtool, qmake
 , rsync, ssh
 }:
 
@@ -15,7 +15,7 @@ mkDerivation rec {
 
   buildInputs = [ rsync ssh ];
 
-  nativeBuildInputs = [ pkgconfig libtool qmake ];
+  nativeBuildInputs = [ pkg-config libtool qmake ];
 
   prePatch = ''
     for File in luckybackup.pro menu/luckybackup-pkexec \

pkgs/tools/backup/mydumper/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig
+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config
 , glib, zlib, pcre, libmysqlclient, libressl }:
 
 let inherit (lib) getDev; in
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
     sha256 = "0vbz0ri5hm6yzkrcgnaj8px6bf59myr5dbhyy7fd4cv44hr685k6";
   };
 
-  nativeBuildInputs = [ cmake pkgconfig ];
+  nativeBuildInputs = [ cmake pkg-config ];
 
   buildInputs = [ glib zlib pcre libmysqlclient libressl ];
 

pkgs/tools/backup/ori/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, boost, pkgconfig, scons, util-linux, fuse, libevent, openssl, zlib }:
+{ lib, stdenv, fetchurl, boost, pkg-config, scons, util-linux, fuse, libevent, openssl, zlib }:
 
 stdenv.mkDerivation {
   version = "0.8.1";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [ 
-    boost pkgconfig scons util-linux fuse libevent openssl zlib
+    boost pkg-config scons util-linux fuse libevent openssl zlib
   ];
 
   buildPhase = ''

pkgs/tools/backup/partclone/default.nix

@@ -1,5 +1,5 @@
 { lib, stdenv, fetchFromGitHub, autoreconfHook
-, pkgconfig, libuuid, e2fsprogs, nilfs-utils, ntfs3g
+, pkg-config, libuuid, e2fsprogs, nilfs-utils, ntfs3g
 }:
 
 stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     sha256 = "0bv15i0gxym4dv48rgaavh8p94waryn1l6viis6qh5zm9cd08skg";
   };
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook pkg-config ];
   buildInputs = [
     e2fsprogs libuuid stdenv.cc.libc nilfs-utils ntfs3g
     (lib.getOutput "static" stdenv.cc.libc)

pkgs/tools/backup/partimage/default.nix

@@ -5,7 +5,7 @@
 , zlib
 , newt
 , openssl
-, pkgconfig
+, pkg-config
 , slang
 , autoreconfHook
 }:
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
 
   configureFlags = [ "--with-ssl-headers=${openssl.dev}/include/openssl" ];
 
-  nativeBuildInputs = [ pkgconfig autoreconfHook ];
+  nativeBuildInputs = [ pkg-config autoreconfHook ];
   buildInputs = [ bzip2 zlib newt newt openssl slang ];
 
   patches = [

pkgs/tools/backup/percona-xtrabackup/generic.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, bison, boost, cmake, makeWrapper, pkgconfig
+{ lib, stdenv, fetchFromGitHub, bison, boost, cmake, makeWrapper, pkg-config
 , curl, cyrus_sasl, libaio, libedit, libev, libevent, libgcrypt, libgpgerror, lz4
 , ncurses, numactl, openssl, protobuf, valgrind, xxd, zlib
 , perlPackages
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     inherit sha256;
   };
 
-  nativeBuildInputs = [ bison boost cmake makeWrapper pkgconfig ];
+  nativeBuildInputs = [ bison boost cmake makeWrapper pkg-config ];
 
   buildInputs = [
     curl cyrus_sasl libaio libedit libev libevent libgcrypt libgpgerror lz4

pkgs/tools/backup/rdedup/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl, libsodium
+{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, libsodium
 , llvmPackages, clang, lzma
 , Security }:
 
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
     ./v3.1.1-fix-Cargo.lock.patch
   ];
 
-  nativeBuildInputs = [ pkgconfig llvmPackages.libclang clang ];
+  nativeBuildInputs = [ pkg-config llvmPackages.libclang clang ];
   buildInputs = [ openssl libsodium lzma ]
     ++ (lib.optional stdenv.isDarwin Security);
 

pkgs/tools/backup/rdup/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, glib, pcre }:
+{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, glib, pcre }:
 
 stdenv.mkDerivation {
   pname = "rdup";
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
     sha256 = "0bzyv6qmnivxnv9nw7lnfn46k0m1dlxcjj53zcva6v8y8084l1iw";
   };
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook pkg-config ];
   buildInputs = [ glib pcre ];
 
   meta = {

pkgs/tools/bluetooth/blueman/default.nix

@@ -1,4 +1,4 @@
-{ config, stdenv, lib, fetchurl, intltool, pkgconfig, python3Packages, bluez, gtk3
+{ config, stdenv, lib, fetchurl, intltool, pkg-config, python3Packages, bluez, gtk3
 , obex_data_server, xdg_utils, dnsmasq, dhcp, libappindicator, iproute
 , gnome3, librsvg, wrapGAppsHook, gobject-introspection, autoreconfHook
 , networkmanager, withPulseAudio ? config.pulseaudio or stdenv.isLinux, libpulseaudio, fetchpatch }:
@@ -17,7 +17,7 @@ in stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    gobject-introspection intltool pkgconfig pythonPackages.cython
+    gobject-introspection intltool pkg-config pythonPackages.cython
     pythonPackages.wrapPython wrapGAppsHook
     autoreconfHook # drop when below patch is removed
   ];

pkgs/tools/bluetooth/bluez-alsa/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, pkgconfig, autoreconfHook
+{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook
 , alsaLib, bluez, glib, sbc, dbus
 
 # optional, but useful utils
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     sha256 = "1jlsgxyqfhncfhx1sy3ry0dp6p95kd4agh7g2b7g51h0c4cv74h8";
   };
 
-  nativeBuildInputs = [ pkgconfig autoreconfHook ];
+  nativeBuildInputs = [ pkg-config autoreconfHook ];
 
   buildInputs = [
     alsaLib bluez glib sbc dbus

pkgs/tools/bluetooth/bluez-tools/default.nix

@@ -1,5 +1,5 @@
 { lib, stdenv, autoreconfHook, readline
-, fetchFromGitHub, glib, pkgconfig }:
+, fetchFromGitHub, glib, pkg-config }:
 
 stdenv.mkDerivation rec {
   date    = "2016-12-12";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     sha256 = "08xp77sf5wnq5086halmyk3vla4bfls06q1zrqdcq36hw6d409i6";
   };
 
-  nativeBuildInputs = [ pkgconfig autoreconfHook ];
+  nativeBuildInputs = [ pkg-config autoreconfHook ];
 
   buildInputs = [ readline glib ];
 

pkgs/tools/bluetooth/obex-data-server/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkgconfig, libusb-compat-0_1, glib, dbus-glib, bluez, openobex, dbus }:
+{ lib, stdenv, fetchurl, pkg-config, libusb-compat-0_1, glib, dbus-glib, bluez, openobex, dbus }:
 
 stdenv.mkDerivation rec {
   name = "obex-data-server-0.4.6";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "0kq940wqs9j8qjnl58d6l3zhx0jaszci356xprx23l6nvdfld6dk";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ libusb-compat-0_1 glib dbus-glib bluez openobex dbus ];
 
   patches = [ ./obex-data-server-0.4.6-build-fixes-1.patch ];

pkgs/tools/bluetooth/obexd/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkgconfig, glib, dbus, openobex, bluez, libical }:
+{ lib, stdenv, fetchurl, pkg-config, glib, dbus, openobex, bluez, libical }:
 
 stdenv.mkDerivation rec {
   name = "obexd-0.48";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ glib dbus openobex bluez libical ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
 
   meta = with lib; {
     homepage = "http://www.bluez.org/";

pkgs/tools/bluetooth/obexfs/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkgconfig, bluez, fuse, obexftp }:
+{ lib, stdenv, fetchurl, pkg-config, bluez, fuse, obexftp }:
 
 stdenv.mkDerivation rec {
   name = "obexfs-0.12";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "1g3krpygk6swa47vbmp9j9s8ahqqcl9ra8r25ybgzv2d9pmjm9kj";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ fuse obexftp bluez ];
 
   meta = with lib; {

pkgs/tools/bluetooth/obexftp/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkgconfig, openobex, bluez, cmake }:
+{ lib, stdenv, fetchurl, pkg-config, openobex, bluez, cmake }:
    
 stdenv.mkDerivation rec {
   name = "obexftp-0.24.2";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "18w9r78z78ri5qc8fjym4nk1jfbrkyr789sq7rxrkshf1a7b83yl";
   };
 
-  nativeBuildInputs = [ pkgconfig cmake ];
+  nativeBuildInputs = [ pkg-config cmake ];
 
   buildInputs = [ bluez ];
 

pkgs/tools/bluetooth/openobex/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkgconfig, bluez, libusb-compat-0_1, cmake }:
+{ lib, stdenv, fetchurl, pkg-config, bluez, libusb-compat-0_1, cmake }:
    
 stdenv.mkDerivation rec {
   name = "openobex-1.7.2";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "1z6l7pbwgs5pjx3861cyd3r6vq5av984bdp4r3hgrw2jxam6120m";
   };
 
-  nativeBuildInputs = [ pkgconfig cmake ];
+  nativeBuildInputs = [ pkg-config cmake ];
   buildInputs = [ bluez libusb-compat-0_1 ];
 
   configureFlags = [ "--enable-apps" ];

pkgs/tools/compression/pixz/default.nix

@@ -1,5 +1,5 @@
 {
-  lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig
+  lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config
   , asciidoc, libxslt, libxml2, docbook_xml_dtd_45, docbook_xsl
   , libarchive, lzma
 }:
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
   version = "1.0.7";
   name = "${baseName}-${version}";
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [
     autoconf automake libtool asciidoc libxslt libxml2
     docbook_xml_dtd_45 docbook_xsl

pkgs/tools/filesystems/android-file-transfer/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, fuse, readline, pkgconfig, qtbase, qttools }:
+{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, fuse, readline, pkg-config, qtbase, qttools }:
 
 mkDerivation rec {
   pname = "android-file-transfer";
@@ -11,7 +11,7 @@ mkDerivation rec {
     sha256 = "125rq8ji83nw6chfw43i0h9c38hjqh1qjibb0gnf9wrigar9zc8b";
   };
 
-  nativeBuildInputs = [ cmake readline pkgconfig ];
+  nativeBuildInputs = [ cmake readline pkg-config ];
   buildInputs = [ fuse qtbase qttools ];
 
   meta = with lib; {

pkgs/tools/filesystems/archivemount/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkgconfig, fuse, libarchive }:
+{ lib, stdenv, fetchurl, pkg-config, fuse, libarchive }:
 
 let
   name = "archivemount-0.9.1";
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
     sha256 = "1cy5b6qril9c3ry6fv7ir87s8iyy5vxxmbyx90dm86fbra0vjaf5";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ fuse libarchive ];
 
   meta = {

pkgs/tools/filesystems/avfs/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkgconfig, fuse, xz }:
+{ lib, stdenv, fetchurl, pkg-config, fuse, xz }:
 
 stdenv.mkDerivation rec {
   pname = "avfs";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "1psh8k7g7rb0gn7aygbjv86kxyi9xq07barxksa99nnmq3lc2kjg";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [ fuse xz ];
 

pkgs/tools/filesystems/bcache-tools/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkgconfig, util-linux, bash }:
+{ lib, stdenv, fetchurl, pkg-config, util-linux, bash }:
 
 stdenv.mkDerivation rec {
   pname = "bcache-tools";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "1gbsh2qw0a7kgck6w0apydiy37nnz5xvdgipa0yqrfmghl86vmv4";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ util-linux ];
 
   # * Remove broken install rules (they ignore $PREFIX) for stuff we don't need

pkgs/tools/filesystems/bcachefs-tools/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, pkgconfig, attr, libuuid, libscrypt, libsodium, keyutils
+{ lib, stdenv, fetchFromGitHub, pkg-config, attr, libuuid, libscrypt, libsodium, keyutils
 , liburcu, zlib, libaio, udev, zstd, lz4, valgrind, python3Packages
 , fuseSupport ? false, fuse3 ? null }:
 
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
                 "INITRAMFS_DIR=${placeholder "out"}/etc/initramfs-tools"
   '';
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [
     libuuid libscrypt libsodium keyutils liburcu zlib libaio

pkgs/tools/filesystems/bindfs/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, fuse, pkgconfig }:
+{ lib, stdenv, fetchurl, fuse, pkg-config }:
 
 stdenv.mkDerivation rec {
   version = "1.14.8";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   dontStrip = true;
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ fuse ];
   postFixup = ''
     ln -s $out/bin/bindfs $out/bin/mount.fuse.bindfs

pkgs/tools/filesystems/blobfuse/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, curl, gnutls, libgcrypt, libuuid, fuse }:
+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, curl, gnutls, libgcrypt, libuuid, fuse }:
 
 stdenv.mkDerivation rec {
   pname = "blobfuse";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   NIX_CFLAGS_COMPILE = "-Wno-error=catch-value";
 
   buildInputs = [ curl gnutls libgcrypt libuuid fuse ];
-  nativeBuildInputs = [ cmake pkgconfig ];
+  nativeBuildInputs = [ cmake pkg-config ];
 
   meta = with lib; {
     description = "Mount an Azure Blob storage as filesystem through FUSE";

pkgs/tools/filesystems/boxfs/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, curl, fuse, libxml2, pkgconfig }:
+{ lib, stdenv, fetchFromGitHub, curl, fuse, libxml2, pkg-config }:
 
 let
   srcs = {
@@ -35,7 +35,7 @@ in stdenv.mkDerivation {
   patches = [ ./work-around-API-borkage.patch ];
 
   buildInputs = [ curl fuse libxml2 ];
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
 
   buildFlags = [ "static" ];
 

pkgs/tools/filesystems/btrfs-progs/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkgconfig, attr, acl, zlib, libuuid, e2fsprogs, lzo
+{ lib, stdenv, fetchurl, pkg-config, attr, acl, zlib, libuuid, e2fsprogs, lzo
 , asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt, zstd, python3
 }:
 
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    pkgconfig asciidoc xmlto docbook_xml_dtd_45 docbook_xsl libxslt
+    pkg-config asciidoc xmlto docbook_xml_dtd_45 docbook_xsl libxslt
     python3 python3.pkgs.setuptools
   ];
 

pkgs/tools/filesystems/ceph/default.nix

@@ -1,7 +1,7 @@
 { stdenv, runCommand, fetchurl
 , fetchpatch
 , ensureNewerSourcesHook
-, cmake, pkgconfig
+, cmake, pkg-config
 , which, git
 , boost, python3Packages
 , libxml2, zlib, lz4
@@ -139,7 +139,7 @@ in rec {
 
     nativeBuildInputs = [
       cmake
-      pkgconfig which git python3Packages.wrapPython makeWrapper
+      pkg-config which git python3Packages.wrapPython makeWrapper
       python3Packages.python # for the toPythonPath function
       (ensureNewerSourcesHook { year = "1980"; })
     ];

pkgs/tools/filesystems/ciopfs/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkgconfig, fuse, glib, attr }:
+{ lib, stdenv, fetchurl, pkg-config, fuse, glib, attr }:
 
 stdenv.mkDerivation rec {
   name = "ciopfs-0.4";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "0sr9i9b3qfwbfvzvk00yrrg3x2xqk1njadbldkvn7hwwa4z5bm9l";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ fuse glib attr ];
 
   makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ];

pkgs/tools/filesystems/cryfs/default.nix

@@ -1,5 +1,5 @@
 { lib, stdenv, fetchFromGitHub, fetchpatch
-, cmake, pkgconfig, python, gtest
+, cmake, pkg-config, python, gtest
 , boost, cryptopp, curl, fuse, openssl
 }:
 
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
       --replace "(4.5L*1024*1024*1024)" "(0.5L*1024*1024*1024)"
   '';
 
-  nativeBuildInputs = [ cmake gtest pkgconfig python ];
+  nativeBuildInputs = [ cmake gtest pkg-config python ];
 
   buildInputs = [ boost cryptopp curl fuse openssl ];
 

pkgs/tools/filesystems/curlftpfs/default.nix

@@ -1,4 +1,4 @@
-{lib, stdenv, fetchurl, fuse, curl, pkgconfig, glib, zlib}:
+{lib, stdenv, fetchurl, fuse, curl, pkg-config, glib, zlib}:
 
 stdenv.mkDerivation {
   name = "curlftpfs-0.9.2";
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
     url = "mirror://sourceforge/curlftpfs/curlftpfs-0.9.2.tar.gz";
     sha256 = "0n397hmv21jsr1j7zx3m21i7ryscdhkdsyqpvvns12q7qwwlgd2f";
   };
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [fuse curl glib zlib];
 
   doCheck = false; # fails, doesn't work well too, btw

pkgs/tools/filesystems/disorderfs/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkgconfig, fuse, attr, asciidoc }:
+{ lib, stdenv, fetchurl, pkg-config, fuse, attr, asciidoc }:
 
 stdenv.mkDerivation rec {
   pname = "disorderfs";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "0xlsl6cw1p0d92crknrcf4iabgig0185dzp80qxh9iyjy42d27gk";
   };
 
-  nativeBuildInputs = [ pkgconfig asciidoc ];
+  nativeBuildInputs = [ pkg-config asciidoc ];
 
   buildInputs = [ fuse attr ];
 

pkgs/tools/filesystems/djmount/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkgconfig, fuse }:
+{ lib, stdenv, fetchurl, pkg-config, fuse }:
 
 stdenv.mkDerivation rec {
   pname = "djmount";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "0kqf0cy3h4cfiy5a2sigmisx0lvvsi1n0fbyb9ll5gacmy1b8nxa";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ fuse];
 
   meta = {

pkgs/tools/filesystems/dosfstools/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libiconv }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libiconv }:
 
 stdenv.mkDerivation rec {
   pname = "dosfstools";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "1a2zn1655d5f1m6jp9vpn3bp8yfxhcmxx3mx23ai9hmxiydiykr1";
   };
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig ]
+  nativeBuildInputs = [ autoreconfHook pkg-config ]
     ++ lib.optional stdenv.isDarwin libiconv;
 
   configureFlags = [ "--enable-compat-symlinks" ];

pkgs/tools/filesystems/duperemove/default.nix

@@ -1,5 +1,5 @@
 { lib, stdenv, fetchFromGitHub, libgcrypt
-, pkgconfig, glib, linuxHeaders ? stdenv.cc.libc.linuxHeaders, sqlite }:
+, pkg-config, glib, linuxHeaders ? stdenv.cc.libc.linuxHeaders, sqlite }:
 
 stdenv.mkDerivation rec {
   pname = "duperemove";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     sha256 = "1a87mka2sfzhbch2jip6wlvvs0glxq9lqwmyrp359d1rmwwmqiw9";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ libgcrypt glib linuxHeaders sqlite ];
 
   makeFlags = [ "PREFIX=${placeholder "out"}" ];

pkgs/tools/filesystems/e2fsprogs/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPackages, fetchurl, fetchpatch, pkgconfig, libuuid, gettext, texinfo
+{ lib, stdenv, buildPackages, fetchurl, fetchpatch, pkg-config, libuuid, gettext, texinfo
 , shared ? !stdenv.hostPlatform.isStatic
 }:
 
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   outputs = [ "bin" "dev" "out" "man" "info" ];
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];
-  nativeBuildInputs = [ pkgconfig texinfo ];
+  nativeBuildInputs = [ pkg-config texinfo ];
   buildInputs = [ libuuid gettext ];
 
   # Only use glibc's __GNUC_PREREQ(X,Y) (checks if compiler is gcc version >= X.Y) when using glibc

pkgs/tools/filesystems/e2tools/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkgconfig, e2fsprogs }:
+{ lib, stdenv, fetchurl, pkg-config, e2fsprogs }:
 
 stdenv.mkDerivation rec {
   pname = "e2tools";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "16wlc54abqz06dpipjdkw58bncpkxlj5f55lkzy07k3cg0bqwg2f";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ e2fsprogs ];
 
   enableParallelBuilding = true;

pkgs/tools/filesystems/encfs/default.nix

@@ -1,5 +1,5 @@
 { lib, stdenv, fetchFromGitHub
-, cmake, pkgconfig, perl
+, cmake, pkg-config, perl
 , gettext, fuse, openssl, tinyxml2
 }:
 
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ gettext fuse openssl tinyxml2 ];
-  nativeBuildInputs = [ cmake pkgconfig perl ];
+  nativeBuildInputs = [ cmake pkg-config perl ];
 
   cmakeFlags =
     [ "-DUSE_INTERNAL_TINYXML=OFF"

pkgs/tools/filesystems/exfat/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, fuse }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, fuse }:
 
 stdenv.mkDerivation rec {
   pname = "exfat";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "1q29pcysv747y6dis07953dkax8k9x50b5gg99gpz6rr46xwgkgb";
   };
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook pkg-config ];
   buildInputs = [ fuse ];
 
   meta = with lib; {

pkgs/tools/filesystems/f2fs-tools/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchgit, autoreconfHook, libselinux, libuuid, pkgconfig }:
+{ lib, stdenv, fetchgit, autoreconfHook, libselinux, libuuid, pkg-config }:
 
 stdenv.mkDerivation rec {
   pname = "f2fs-tools";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "06ss05n87i1c3149qb3n7j1qp2scv3g2adx0v6ljkl59ab9b5saj";
   };
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook pkg-config ];
   buildInputs = [ libselinux libuuid ];
 
   patches = [ ./f2fs-tools-cross-fix.patch ];

pkgs/tools/filesystems/fuse-7z-ng/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, fuse, p7zip, autoconf, automake, pkgconfig, makeWrapper }:
+{ lib, stdenv, fetchFromGitHub, fuse, p7zip, autoconf, automake, pkg-config, makeWrapper }:
 
 stdenv.mkDerivation rec {
   pname = "fuse-7z-ng";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "17v1gcmg5q661b047zxjar735i4d3508dimw1x3z1pk4d1zjhp3x";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ fuse autoconf automake makeWrapper ];
 
   preConfigure = "./autogen.sh";

pkgs/tools/filesystems/fuseiso/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook, pkgconfig, fuse, glib, zlib }:
+{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook, pkg-config, fuse, glib, zlib }:
 
 stdenv.mkDerivation rec {
   pname = "fuseiso";
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook pkg-config ];
 
   buildInputs = [ fuse glib zlib ];
 

pkgs/tools/filesystems/genimage/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkgconfig, libconfuse, gettext }:
+{ lib, stdenv, fetchurl, pkg-config, libconfuse, gettext }:
 
 stdenv.mkDerivation rec {
   pname = "genimage";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "0y4h8x8lqxam8m90rdfq8cg5137kvilxr3d1qzddpx7nxpvmmwv9";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ libconfuse gettext ];
 
   postInstall = ''

pkgs/tools/filesystems/glusterfs/default.nix

@@ -1,5 +1,5 @@
 {lib, stdenv, fetchFromGitHub, fuse, bison, flex_2_5_35, openssl, python3, ncurses, readline,
- autoconf, automake, libtool, pkgconfig, zlib, libaio, libxml2, acl, sqlite,
+ autoconf, automake, libtool, pkg-config, zlib, libaio, libxml2, acl, sqlite,
  liburcu, attr, makeWrapper, coreutils, gnused, gnugrep, which,
  openssh, gawk, findutils, util-linux, lvm2, btrfs-progs, e2fsprogs, xfsprogs, systemd,
  rsync, glibc, rpcsvc-proto, libtirpc
@@ -15,7 +15,7 @@ let
 
   buildInputs = [
     fuse bison flex_2_5_35 openssl ncurses readline
-    autoconf automake libtool pkgconfig zlib libaio libxml2
+    autoconf automake libtool pkg-config zlib libaio libxml2
     acl sqlite liburcu attr makeWrapper util-linux libtirpc
     (python3.withPackages (pkgs: [
       pkgs.flask

pkgs/tools/filesystems/go-mtpfs/default.nix

@@ -1,4 +1,4 @@
-{ pkgconfig, libusb1, buildGoPackage, fetchgit }:
+{ pkg-config, libusb1, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
   pname = "go-mtpfs";
@@ -7,7 +7,7 @@ buildGoPackage rec {
 
   goPackagePath = "github.com/hanwen/go-mtpfs";
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ libusb1 ];
 
   src = fetchgit {