pkgs/games: pkgconfig -> pkg-config

This commit is contained in:
Ben Siraphob 2021-01-17 09:04:36 +07:00 committed by Jonathan Ringer
parent 2fbc36f3d8
commit 47e997598c
14 changed files with 28 additions and 28 deletions

View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, boost, curl, ffmpeg, icoutils, libGLU, libmad, libogg { lib, stdenv, fetchurl, boost, curl, ffmpeg, icoutils, libGLU, libmad, libogg
, libpng, libsndfile, libvorbis, lua, pkgconfig, SDL2, SDL2_image, SDL2_net , libpng, libsndfile, libvorbis, lua, pkg-config, SDL2, SDL2_image, SDL2_net
, SDL2_ttf, smpeg, speex, zziplib, zlib, makeWrapper, makeDesktopItem, unzip , SDL2_ttf, smpeg, speex, zziplib, zlib, makeWrapper, makeDesktopItem, unzip
, alephone }: , alephone }:
@ -15,7 +15,7 @@ let
sha256 = "13ck3mp9qd5pkiq6zwvr744bwvmnqkgj5vpf325sz1mcvnv7l8lh"; sha256 = "13ck3mp9qd5pkiq6zwvr744bwvmnqkgj5vpf325sz1mcvnv7l8lh";
}; };
nativeBuildInputs = [ pkgconfig icoutils ]; nativeBuildInputs = [ pkg-config icoutils ];
buildInputs = [ buildInputs = [
boost boost

View File

@ -1,5 +1,5 @@
{ fetchurl, lib, stdenv, SDL, SDL_image, SDL_mixer, SDL_sound, libsigcxx, physfs { fetchurl, lib, stdenv, SDL, SDL_image, SDL_mixer, SDL_sound, libsigcxx, physfs
, boost, expat, freetype, libjpeg, wxGTK, lua, perl, pkgconfig, zlib, zip, bzip2 , boost, expat, freetype, libjpeg, wxGTK, lua, perl, pkg-config, zlib, zip, bzip2
, libpng, libtiff, fluidsynth, libmikmod, libvorbis, flac, libogg }: , libpng, libtiff, fluidsynth, libmikmod, libvorbis, flac, libogg }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
SDL SDL_image SDL_mixer SDL_sound libsigcxx physfs boost expat SDL SDL_image SDL_mixer SDL_sound libsigcxx physfs boost expat
freetype libjpeg wxGTK lua perl pkgconfig zlib zip bzip2 libpng freetype libjpeg wxGTK lua perl pkg-config zlib zip bzip2 libpng
libtiff fluidsynth libmikmod flac libvorbis libogg libtiff fluidsynth libmikmod flac libvorbis libogg
]; ];

View File

@ -1,4 +1,4 @@
{ lib, stdenv, autoreconfHook, pkgconfig, SDL2, SDL2_mixer, SDL2_net, fetchFromGitHub }: { lib, stdenv, autoreconfHook, pkg-config, SDL2, SDL2_mixer, SDL2_net, fetchFromGitHub }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "chocolate-doom"; pname = "chocolate-doom";
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
sed -e 's#/games#/bin#g' -i src{,/setup}/Makefile.am sed -e 's#/games#/bin#g' -i src{,/setup}/Makefile.am
''; '';
nativeBuildInputs = [ autoreconfHook pkgconfig ]; nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ SDL2 SDL2_mixer SDL2_net ]; buildInputs = [ SDL2 SDL2_mixer SDL2_net ];
enableParallelBuilding = true; enableParallelBuilding = true;

View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pkgconfig, gtk2, freeglut, SDL, SDL_mixer, libGLU, libGL, libXi, libXmu }: { lib, stdenv, fetchurl, pkg-config, gtk2, freeglut, SDL, SDL_mixer, libGLU, libGL, libXi, libXmu }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "crack-attack-1.1.14"; name = "crack-attack-1.1.14";
@ -19,7 +19,7 @@ stdenv.mkDerivation {
"--datadir=${placeholder "out"}/share" "--datadir=${placeholder "out"}/share"
]; ];
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ gtk2 freeglut SDL SDL_mixer libGLU libGL libXi libXmu ]; buildInputs = [ gtk2 freeglut SDL SDL_mixer libGLU libGL libXi libXmu ];
hardeningDisable = [ "format" ]; hardeningDisable = [ "format" ];

View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, makeWrapper, pkgconfig, nasm, makeDesktopItem { lib, stdenv, fetchurl, makeWrapper, pkg-config, nasm, makeDesktopItem
, alsaLib, flac, gtk2, libvorbis, libvpx, libGLU, libGL , alsaLib, flac, gtk2, libvorbis, libvpx, libGLU, libGL
, SDL2, SDL2_mixer }: , SDL2, SDL2_mixer }:
@ -29,7 +29,7 @@ in stdenv.mkDerivation {
buildInputs = [ alsaLib flac gtk2 libvorbis libvpx libGL libGLU SDL2 SDL2_mixer ]; buildInputs = [ alsaLib flac gtk2 libvorbis libvpx libGL libGLU SDL2 SDL2_mixer ];
nativeBuildInputs = [ makeWrapper pkgconfig ] nativeBuildInputs = [ makeWrapper pkg-config ]
++ lib.optional (stdenv.hostPlatform.system == "i686-linux") nasm; ++ lib.optional (stdenv.hostPlatform.system == "i686-linux") nasm;
postPatch = '' postPatch = ''

View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, substituteAll, jam, cctools, pkgconfig { lib, stdenv, fetchFromGitHub, substituteAll, jam, cctools, pkg-config
, SDL, SDL_mixer, SDL_sound, gtk2, libvorbis, smpeg }: , SDL, SDL_mixer, SDL_sound, gtk2, libvorbis, smpeg }:
let let
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
sha256 = "0w54avmbp4i4zps2rb4acmpa641s6wvwbrln4vbdhcz97fx48nzz"; sha256 = "0w54avmbp4i4zps2rb4acmpa641s6wvwbrln4vbdhcz97fx48nzz";
}; };
nativeBuildInputs = [ jam pkgconfig ] ++ lib.optional stdenv.isDarwin cctools; nativeBuildInputs = [ jam pkg-config ] ++ lib.optional stdenv.isDarwin cctools;
buildInputs = [ SDL SDL_mixer SDL_sound gtk2 ] buildInputs = [ SDL SDL_mixer SDL_sound gtk2 ]
++ lib.optionals stdenv.isDarwin [ smpeg libvorbis ]; ++ lib.optionals stdenv.isDarwin [ smpeg libvorbis ];

View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchbzr, intltool { lib, stdenv, fetchbzr, intltool
, gtk2, wrapGAppsHook, autoreconfHook, pkgconfig , gtk2, wrapGAppsHook, autoreconfHook, pkg-config
, libmikmod, librsvg, libcanberra-gtk2, hicolor-icon-theme }: , libmikmod, librsvg, libcanberra-gtk2, hicolor-icon-theme }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
doCheck = false; doCheck = false;
nativeBuildInputs = [ wrapGAppsHook intltool autoreconfHook pkgconfig ]; nativeBuildInputs = [ wrapGAppsHook intltool autoreconfHook pkg-config ];
buildInputs = [ gtk2 libmikmod librsvg hicolor-icon-theme libcanberra-gtk2 ]; buildInputs = [ gtk2 libmikmod librsvg hicolor-icon-theme libcanberra-gtk2 ];

View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, jam, pkgconfig { lib, stdenv, fetchFromGitHub, autoreconfHook, jam, pkg-config
, zlib, libxml2, libxslt, xorgproto, libX11, libGLU, libGL, SDL , zlib, libxml2, libxslt, xorgproto, libX11, libGLU, libGL, SDL
, SDL_mixer, SDL_image, SDL_ttf, SDL_gfx, physfs , SDL_mixer, SDL_image, SDL_ttf, SDL_gfx, physfs
}: }:
@ -17,7 +17,7 @@ stdenv.mkDerivation {
hardeningDisable = [ "format" ]; hardeningDisable = [ "format" ];
nativeBuildInputs = [ nativeBuildInputs = [
autoreconfHook jam pkgconfig autoreconfHook jam pkg-config
]; ];
buildInputs = [ buildInputs = [

View File

@ -1,4 +1,4 @@
{ lib, fetchurl, stdenv, SDL, openal, SDL_mixer, libxml2, pkgconfig, libvorbis { lib, fetchurl, stdenv, SDL, openal, SDL_mixer, libxml2, pkg-config, libvorbis
, libpng, libGLU, libGL, makeWrapper, zlib, freetype }: , libpng, libGLU, libGL, makeWrapper, zlib, freetype }:
let let
@ -21,7 +21,7 @@ stdenv.mkDerivation {
buildInputs = [ SDL SDL_mixer openal libxml2 libvorbis libpng libGLU libGL zlib freetype ]; buildInputs = [ SDL SDL_mixer openal libxml2 libvorbis libpng libGLU libGL zlib freetype ];
nativeBuildInputs = [ pkgconfig makeWrapper ]; nativeBuildInputs = [ pkg-config makeWrapper ];
NIX_CFLAGS_COMPILE="-include ${zlib.dev}/include/zlib.h"; NIX_CFLAGS_COMPILE="-include ${zlib.dev}/include/zlib.h";

View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gettext, ncurses }: { lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, gettext, ncurses }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "nudoku"; pname = "nudoku";
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
substituteInPlace configure.ac --replace 0.19 0.20 substituteInPlace configure.ac --replace 0.19 0.20
''; '';
nativeBuildInputs = [ autoreconfHook pkgconfig gettext ]; nativeBuildInputs = [ autoreconfHook pkg-config gettext ];
buildInputs = [ ncurses ]; buildInputs = [ ncurses ];
configureFlags = lib.optional stdenv.hostPlatform.isMusl "--disable-nls"; configureFlags = lib.optional stdenv.hostPlatform.isMusl "--disable-nls";

View File

@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub { lib, stdenv, fetchFromGitHub
, SDL2, cmake, curl, duktape, fontconfig, freetype, icu, jansson, libGLU , SDL2, cmake, curl, duktape, fontconfig, freetype, icu, jansson, libGLU
, libiconv, libpng, libpthreadstubs, libzip, nlohmann_json, openssl, pkgconfig , libiconv, libpng, libpthreadstubs, libzip, nlohmann_json, openssl, pkg-config
, speexdsp, zlib , speexdsp, zlib
}: }:
@ -36,7 +36,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake
pkgconfig pkg-config
]; ];
buildInputs = [ buildInputs = [

View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, fetchurl, cmake, pkgconfig, SDL, SDL_image, SDL_mixer, SDL_net, SDL_ttf, libpng, librsvg, libxml2 }: { lib, stdenv, fetchFromGitHub, fetchurl, cmake, pkg-config, SDL, SDL_image, SDL_mixer, SDL_net, SDL_ttf, libpng, librsvg, libxml2 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "0.1.1"; version = "0.1.1";
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
}) })
]; ];
nativeBuildInputs = [ cmake pkgconfig ]; nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ SDL SDL_image SDL_mixer SDL_net SDL_ttf libpng librsvg libxml2 ]; buildInputs = [ SDL SDL_image SDL_mixer SDL_net SDL_ttf libpng librsvg libxml2 ];
meta = with lib; { meta = with lib; {

View File

@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl { lib, stdenv, fetchurl
# Build depends # Build depends
, docutils, meson, ninja, pkgconfig, python3 , docutils, meson, ninja, pkg-config, python3
# Runtime depends # Runtime depends
, glfw, SDL2, SDL2_mixer , glfw, SDL2, SDL2_mixer
, freetype, libpng, libwebp, libzip, zlib , freetype, libpng, libwebp, libzip, zlib
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ nativeBuildInputs = [
docutils meson ninja pkgconfig python3 docutils meson ninja pkg-config python3
]; ];
buildInputs = [ buildInputs = [

View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, scons, pkgconfig, SDL2, lua, fftwFloat, { lib, stdenv, fetchFromGitHub, scons, pkg-config, SDL2, lua, fftwFloat,
zlib, bzip2, curl, darwin }: zlib, bzip2, curl, darwin }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "18rp2g1mj0gklra06wm9dm57h73hmm301npndh0y8ap192i5s8sa"; sha256 = "18rp2g1mj0gklra06wm9dm57h73hmm301npndh0y8ap192i5s8sa";
}; };
nativeBuildInputs = [ scons pkgconfig ]; nativeBuildInputs = [ scons pkg-config ];
propagatedBuildInputs = lib.optionals stdenv.isDarwin propagatedBuildInputs = lib.optionals stdenv.isDarwin
[ darwin.apple_sdk.frameworks.Cocoa ]; [ darwin.apple_sdk.frameworks.Cocoa ];