From 8093548f673f27d5a144f1ec5b8b0887f13c5e72 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 16 Jun 2021 00:33:48 +0200 Subject: 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 Cc: @sternenseemann for "opam-env" --- pkgs/games/gog/warcraft2/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/games/gog/warcraft2') 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 ]; }; -- cgit 1.4.1