lol

pingus, quirc: fix pkgconfig passing

+5 -7
+2 -3
pkgs/games/pingus/default.nix
··· 1 1 {stdenv, fetchurl, scons, SDL, SDL_image, boost, libpng, SDL_mixer, pkgconfig 2 2 , mesa}: 3 3 let 4 - nativeBuildInputs = [ pkgconfig ]; 5 - buildInputs = [scons SDL SDL_image boost libpng SDL_mixer mesa]; 6 4 s = # Generated upstream information 7 5 rec { 8 6 baseName="pingus"; ··· 15 13 in 16 14 stdenv.mkDerivation rec { 17 15 inherit (s) name version; 18 - inherit buildInputs; 16 + nativeBuildInputs = [ pkgconfig ]; 17 + buildInputs = [scons SDL SDL_image boost libpng SDL_mixer mesa]; 19 18 src = fetchurl { 20 19 inherit (s) url sha256; 21 20 };
+3 -4
pkgs/tools/graphics/quirc/default.nix
··· 10 10 rev = "5b262480091d5f84a67a4a56c728fc8b39844339"; 11 11 sha256 = "1w5qvjafn14s6jjs7kiwsqirlsqbgv0p152hrsq463pm34hp0lzy"; 12 12 }; 13 + in 14 + stdenv.mkDerivation { 15 + inherit (s) name version; 13 16 nativeBuildInputs = [ pkgconfig ]; 14 17 buildInputs = [ 15 18 SDL SDL_gfx libjpeg libpng 16 19 ]; 17 - in 18 - stdenv.mkDerivation { 19 - inherit (s) name version; 20 - inherit buildInputs; 21 20 src = fetchgit { 22 21 inherit (s) url sha256 rev; 23 22 };