about summary refs log tree commit diff
path: root/pkgs/games
diff options
context:
space:
mode:
authoraszlig <aszlig@nix.build>2021-06-16 00:33:48 +0200
committeraszlig <aszlig@nix.build>2021-06-16 00:33:48 +0200
commit8093548f673f27d5a144f1ec5b8b0887f13c5e72 (patch)
tree5964b80c2f9ad723650821decf71b3231ef23f62 /pkgs/games
parent9ae4281a5d30a34992844574abb707e949f0d9f9 (diff)
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"
Diffstat (limited to 'pkgs/games')
-rw-r--r--pkgs/games/gog/fetch-gog/default.nix4
-rw-r--r--pkgs/games/gog/homm3/default.nix4
-rw-r--r--pkgs/games/gog/warcraft2/default.nix6
-rw-r--r--pkgs/games/humblebundle/fetch-humble-bundle/default.nix4
4 files changed, 9 insertions, 9 deletions
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;