From 0734f54ef262ad642eec1166a416bae86779ed9f Mon Sep 17 00:00:00 2001 From: Artturin Date: Sun, 25 Sep 2022 05:49:25 +0300 Subject: treewide: move pkg-config, autoreconfHook, intltool to nativeBuildInputs found with nixpkgs-lint --- pkgs/games/asc/default.nix | 4 +++- pkgs/games/extremetuxracer/default.nix | 3 ++- pkgs/games/freedink/default.nix | 4 +++- pkgs/games/xboard/default.nix | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) (limited to 'pkgs/games') diff --git a/pkgs/games/asc/default.nix b/pkgs/games/asc/default.nix index a6a1129acad73..46f8231680bd2 100644 --- a/pkgs/games/asc/default.nix +++ b/pkgs/games/asc/default.nix @@ -16,9 +16,11 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-fpermissive -Wno-error=narrowing -std=c++11"; # I'm too lazy to catch all gcc47-related problems hardeningDisable = [ "format" ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ SDL SDL_image SDL_mixer SDL_sound libsigcxx physfs boost expat - freetype libjpeg wxGTK lua perl pkg-config zlib zip bzip2 libpng + freetype libjpeg wxGTK lua perl zlib zip bzip2 libpng libtiff fluidsynth libmikmod flac libvorbis libogg ]; diff --git a/pkgs/games/extremetuxracer/default.nix b/pkgs/games/extremetuxracer/default.nix index 416a3ac913ea4..71887c8b47dc2 100644 --- a/pkgs/games/extremetuxracer/default.nix +++ b/pkgs/games/extremetuxracer/default.nix @@ -13,11 +13,12 @@ stdenv.mkDerivation rec { sha256 = "sha256-HIdJZeniSVM78VwI2rxh5gwFuz/VeJF4gBF/+KkQzU4="; }; + nativeBuildInputs = [ pkg-config intltool ]; buildInputs = [ libGLU libGL libX11 xorgproto tcl freeglut freetype sfml libXi libXmu libXext libXt libSM libICE - libpng pkg-config gettext intltool + libpng gettext ]; configureFlags = [ "--with-tcl=${tcl}/lib" ]; diff --git a/pkgs/games/freedink/default.nix b/pkgs/games/freedink/default.nix index b48d7e52cf394..ecdcbb7dce69a 100644 --- a/pkgs/games/freedink/default.nix +++ b/pkgs/games/freedink/default.nix @@ -25,9 +25,11 @@ in stdenv.mkDerivation rec { sha256 = "19xximbcm6506kvpf3s0q96697kmzca3yrjdr6dgphklp33zqsqr"; }; + nativeBuildInputs = [ pkg-config intltool ]; + buildInputs = [ SDL SDL_mixer SDL_image SDL_ttf SDL_gfx - pkg-config intltool fontconfig libzip zip zlib + fontconfig libzip zip zlib ]; preConfigure = '' diff --git a/pkgs/games/xboard/default.nix b/pkgs/games/xboard/default.nix index eefbb90114ffa..af75ec79e730c 100644 --- a/pkgs/games/xboard/default.nix +++ b/pkgs/games/xboard/default.nix @@ -39,6 +39,7 @@ stdenv.mkDerivation rec { }) ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 xorgproto @@ -51,7 +52,6 @@ stdenv.mkDerivation rec { gnuchess texinfo libXpm - pkg-config librsvg cairo pango -- cgit 1.4.1