treewide: Replace pkgconfig with pkg-config

This is another alias which got introduced in 2018, because the actual
command is "pkg-config" and so the package name containing a dash is
more reasonable.

The reason why I'm doing this is because NixOS VM tests now disallow
aliases and while the evaluation error in question only affected the
"gnupg" test, I decided to change all occurences in the event that we
might want to disallow aliases for things other than VM tests.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @sternenseemann for "opam-env"

8 files changed, 16 insertions, 16 deletions

diff --git a/pkgs/aszlig/pvolctrl/default.nix b/pkgs/aszlig/pvolctrl/default.nix
index 5701c19e..3f92a22f 100644
--- a/pkgs/aszlig/pvolctrl/default.nix
+++ b/pkgs/aszlig/pvolctrl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, libpulseaudio }:
+{ stdenv, fetchurl, pkg-config, libpulseaudio }:
 
 stdenv.mkDerivation rec {
   name = "pvolctrl-0.23";
@@ -31,5 +31,5 @@ stdenv.mkDerivation rec {
     install -D -T pvolctrl "$out/bin/pvolctrl"
   '';
 
-  buildInputs = [ pkgconfig libpulseaudio ];
+  buildInputs = [ pkg-config libpulseaudio ];
 }
diff --git a/pkgs/build-support/build-sandbox/default.nix b/pkgs/build-support/build-sandbox/default.nix
index 50b8f78f..3b42f4f3 100644
--- a/pkgs/build-support/build-sandbox/default.nix
+++ b/pkgs/build-support/build-sandbox/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, pkgconfig, closureInfo, nix, boost, dash }:
+{ stdenv, lib, pkg-config, closureInfo, nix, boost, dash }:
 
 drv: { paths ? {}, ... }@attrs:
 
@@ -97,7 +97,7 @@ in stdenv.mkDerivation ({
     done
   '';
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ boost nix ];
   makeFlags = [ "BINDIR=${drv}/bin" "EXTRA_NS_FLAGS=${extraNamespaceFlags}" ]
            ++ lib.optional allowBinSh "BINSH_EXECUTABLE=${dash}/bin/dash"
diff --git a/pkgs/games/gog/fetch-gog/default.nix b/pkgs/games/gog/fetch-gog/default.nix
index d7d3289b..a3cbf211 100644
--- a/pkgs/games/gog/fetch-gog/default.nix
+++ b/pkgs/games/gog/fetch-gog/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, curl, writeText, runCommandCC, python3Packages, cacert
-, pkgconfig, qt5
+, pkg-config, qt5
 
 , email, password
 }:
@@ -156,7 +156,7 @@ let
 
     dontUnpack = true;
 
-    nativeBuildInputs = [ pkgconfig (qt5.wrapQtAppsHook or null) ];
+    nativeBuildInputs = [ pkg-config (qt5.wrapQtAppsHook or null) ];
     buildInputs = [ qt5.qtbase qt5.qtwebengine ];
     preferLocalBuild = true;
 
diff --git a/pkgs/games/gog/homm3/default.nix b/pkgs/games/gog/homm3/default.nix
index 5aecb8f2..63c17c5f 100644
--- a/pkgs/games/gog/homm3/default.nix
+++ b/pkgs/games/gog/homm3/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, buildSandbox, fetchGog, runCommand, makeWrapper, fetchFromGitHub
-, cmake, pkgconfig, python3, boost, zlib, minizip, qt5
+, cmake, pkg-config, python3, boost, zlib, minizip, qt5
 , SDL2, SDL2_image, SDL2_mixer, SDL2_ttf
 , innoextract, parallel, ffmpeg
 }:
@@ -68,7 +68,7 @@ let
 
     cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" "-DENABLE_TEST=0" ];
     enableParallelBuilding = true;
-    nativeBuildInputs = [ cmake pkgconfig python3 makeWrapper ];
+    nativeBuildInputs = [ cmake pkg-config python3 makeWrapper ];
     buildInputs = [
       boost zlib minizip SDL2 SDL2_image SDL2_mixer SDL2_ttf ffmpeg
       qt5.qtbase
diff --git a/pkgs/games/gog/warcraft2/default.nix b/pkgs/games/gog/warcraft2/default.nix
index c576439f..13802424 100644
--- a/pkgs/games/gog/warcraft2/default.nix
+++ b/pkgs/games/gog/warcraft2/default.nix
@@ -2,7 +2,7 @@
 , fetchFromGitHub, winePackages, xvfb_run, ffmpeg, rename
 
 # Dependencies for the Stratagus engine
-, cmake, pkgconfig, toluapp, lua5_1, libpng, libmng, zlib, SDL, fluidsynth
+, cmake, pkg-config, toluapp, lua5_1, libpng, libmng, zlib, SDL, fluidsynth
 , bzip2, libmikmod, libogg, libvorbis, libtheora, libGLU_combined, sqlite
 }:
 
@@ -42,7 +42,7 @@ let
       "-DOpenGL_GL_PREFERENCE=GLVND" "-DENABLE_DEV=ON"
       "-DGAMEDIR=${placeholder "out"}/bin"
     ];
-    nativeBuildInputs = [ cmake pkgconfig toluapp ];
+    nativeBuildInputs = [ cmake pkg-config toluapp ];
     buildInputs = [
       toluapp lua5_1 libpng libmng zlib SDL fluidsynth bzip2 libmikmod libogg
       libvorbis libtheora libGLU_combined sqlite
@@ -106,7 +106,7 @@ let
     '';
 
     cmakeFlags = [ "-DGAMEDIR=${placeholder "out"}/bin" ];
-    nativeBuildInputs = [ cmake pkgconfig ];
+    nativeBuildInputs = [ cmake pkg-config ];
     buildInputs = [ stratagus zlib libpng bzip2 stormlib ];
   };
 
diff --git a/pkgs/games/humblebundle/fetch-humble-bundle/default.nix b/pkgs/games/humblebundle/fetch-humble-bundle/default.nix
index 53559133..6e9fb639 100644
--- a/pkgs/games/humblebundle/fetch-humble-bundle/default.nix
+++ b/pkgs/games/humblebundle/fetch-humble-bundle/default.nix
@@ -2,7 +2,7 @@
 , python, python3, pythonPackages
 
 # Dependencies for the captcha solver
-, pkgconfig, qt5
+, pkg-config, qt5
 
 , email, password
 }:
@@ -89,7 +89,7 @@ let
 
     dontUnpack = true;
 
-    nativeBuildInputs = [ pkgconfig (qt5.wrapQtAppsHook or null) ];
+    nativeBuildInputs = [ pkg-config (qt5.wrapQtAppsHook or null) ];
     buildInputs = [ qt5.qtbase qt5.qtwebengine ];
     preferLocalBuild = true;
 
diff --git a/pkgs/list-gamecontrollers/default.nix b/pkgs/list-gamecontrollers/default.nix
index 15a9e03c..0fd5ef34 100644
--- a/pkgs/list-gamecontrollers/default.nix
+++ b/pkgs/list-gamecontrollers/default.nix
@@ -1,7 +1,7 @@
-{ runCommandCC, pkgconfig, SDL2 }:
+{ runCommandCC, pkg-config, SDL2 }:
 
 runCommandCC "list-gamecontrollers" {
-  buildInputs = [ pkgconfig SDL2 ];
+  buildInputs = [ pkg-config SDL2 ];
 } ''
   mkdir -p "$out/bin"
   cc -Werror "${./list-gc.c}" \
diff --git a/pkgs/sternenseemann/scripts/default.nix b/pkgs/sternenseemann/scripts/default.nix
index de0b0a02..010bd6cd 100644
--- a/pkgs/sternenseemann/scripts/default.nix
+++ b/pkgs/sternenseemann/scripts/default.nix
@@ -163,7 +163,7 @@ lib.fix (self: {
 
   opam-env = writeBashBin "opam-env" ''
     nix-shell -p pkgs.opam \
-      pkgs.m4 pkgs.gnumake pkgs.binutils pkgs.gcc pkgs.gmp pkgs.glib pkgs.pkgconfig \
+      pkgs.m4 pkgs.gnumake pkgs.binutils pkgs.gcc pkgs.gmp pkgs.glib pkgs.pkg-config \
       --command ". $HOME/.opam/opam-init/init.sh; eval \`opam config env\`; return" \
   '';