treewide: pkgconfig -> pkg-config

*sighs*

boot/script-loader/mruby-lvgui-native/lvgui.nix

@@ -61,12 +61,12 @@ let
     , libxkbcommon
     , meson
     , ninja
-    , pkgconfig
+    , pkg-config
     , yacc
     }:
 
     libxkbcommon.overrideAttrs({...}: {
-      nativeBuildInputs = [ meson ninja pkgconfig yacc ];
+      nativeBuildInputs = [ meson ninja pkg-config yacc ];
       buildInputs = [ ];
 
       mesonFlags = [

overlay/libhybris/default.nix

@@ -3,7 +3,7 @@ stdenv
 , lib
 , fetchFromGitHub
 , autoreconfHook
-, pkgconfig
+, pkg-config
 
 , android-headers
 , file
@@ -53,6 +53,6 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [
     autoreconfHook
-    pkgconfig
+    pkg-config
   ];
 }

overlay/mobile-nixos/kernel/builder.nix

@@ -46,7 +46,7 @@
 
 # For menuconfig
 , ncurses
-, pkgconfig
+, pkg-config
 , runtimeShell
 
 # A structured Linux configuration option attrset.
@@ -164,8 +164,8 @@ let
   # Inspired from #91991
   # https://github.com/NixOS/nixpkgs/pull/91991
   # (required for menuconfig)
-  pkgconfig-helper = writeShellScriptBin "pkg-config" ''
-    exec ${buildPackages.pkgconfig}/bin/${buildPackages.pkgconfig.targetPrefix}pkg-config "$@"
+  pkg-config-helper = writeShellScriptBin "pkg-config" ''
+    exec ${buildPackages.pkg-config}/bin/${buildPackages.pkg-config.targetPrefix}pkg-config "$@"
   '';
 
   hasDTB = platform.linux-kernel ? DTB && platform.linux-kernel.DTB;
@@ -525,7 +525,7 @@ stdenv.mkDerivation (inputArgs // {
     menuconfig = kernelDerivation.overrideAttrs({nativeBuildInputs ? [] , ...}: {
       nativeBuildInputs = nativeBuildInputs ++ [
         ncurses
-        pkgconfig-helper
+        pkg-config-helper
       ];
       buildFlags = [ "nconfig" "V=1" ];
 
@@ -534,7 +534,7 @@ stdenv.mkDerivation (inputArgs // {
         (PS4=" $ "; set -x
 
         # Hot fixes pkg-config use.
-        export PKG_CONFIG_PATH="${buildPackages.ncurses.dev}/lib/pkgconfig"
+        export PKG_CONFIG_PATH="${buildPackages.ncurses.dev}/lib/pkg-config"
         if [ -e scripts/kconfig/nconf-cfg.sh ]; then
           sed -i"" \
             -e 's/$(pkg-config --libs $PKG)/-L $(pkg-config --variable=libdir ncursesw) $(pkg-config --libs $PKG)/' \

overlay/mruby-builder/mruby/default.nix

@@ -160,8 +160,8 @@ let
   # As 2.2 will require other invasive changes, this is worked around until 2.2 is released.
   # The default (without other inputs) mruby build does not use `pkg-config`,
   # but its `#search_package` implementation does.
-  pkgconfig-helper = buildPackages.writeShellScriptBin "pkg-config" ''
-    exec ${buildPackages.pkgconfig}/bin/${buildPackages.pkgconfig.targetPrefix}pkg-config "$@"
+  pkg-config-helper = buildPackages.writeShellScriptBin "pkg-config" ''
+    exec ${buildPackages.pkg-config}/bin/${buildPackages.pkg-config.targetPrefix}pkg-config "$@"
   '';
   mruby = stdenv.mkDerivation rec {
     pname = "mruby";
@@ -188,7 +188,7 @@ let
         --replace '//#define MRB_INT64' '#define MRB_INT64'
     '';
 
-    nativeBuildInputs = [ pkgconfig-helper ruby bison pkgsBuildBuild.rake ] ++ gemNativeBuildInputs;
+    nativeBuildInputs = [ pkg-config-helper ruby bison pkgsBuildBuild.rake ] ++ gemNativeBuildInputs;
     buildInputs = gemBuildInputs;
 
     # Necessary so it uses `gcc` instead of `ld` for linking.

overlay/ply-image/default.nix

@@ -1,4 +1,4 @@
-{stdenv, fetchgit, libpng, libdrm, pkgconfig}:
+{stdenv, fetchgit, libpng, libdrm, pkg-config}:
 
 let
   version = "2016-01-11";
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
   ];
 
   nativeBuildInputs = [
-    pkgconfig
+    pkg-config
   ];
   buildInputs = [
     libpng