b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

pingus, quirc: fix pkgconfig passing

Browse source
This commit is contained in:
Michael Raskin 2017-10-10 17:22:48 +02:00
parent e71a6aabf8
commit ef291b52f3
2 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/games/pingus/default.nix
View file

@ -1,8 +1,6 @@
{stdenv, fetchurl, scons, SDL, SDL_image, boost, libpng, SDL_mixer, pkgconfig {stdenv, fetchurl, scons, SDL, SDL_image, boost, libpng, SDL_mixer, pkgconfig
, mesa}: , mesa}:
let let
nativeBuildInputs = [ pkgconfig ];
buildInputs = [scons SDL SDL_image boost libpng SDL_mixer mesa];
s = # Generated upstream information s = # Generated upstream information
rec { rec {
baseName="pingus"; baseName="pingus";
@ -15,7 +13,8 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
inherit (s) name version; inherit (s) name version;
inherit buildInputs; nativeBuildInputs = [ pkgconfig ];
buildInputs = [scons SDL SDL_image boost libpng SDL_mixer mesa];
src = fetchurl { src = fetchurl {
inherit (s) url sha256; inherit (s) url sha256;
}; };

7
pkgs/tools/graphics/quirc/default.nix
View file

@ -10,14 +10,13 @@ let
rev = "5b262480091d5f84a67a4a56c728fc8b39844339"; rev = "5b262480091d5f84a67a4a56c728fc8b39844339";
sha256 = "1w5qvjafn14s6jjs7kiwsqirlsqbgv0p152hrsq463pm34hp0lzy"; sha256 = "1w5qvjafn14s6jjs7kiwsqirlsqbgv0p152hrsq463pm34hp0lzy";
}; };
in
stdenv.mkDerivation {
inherit (s) name version;
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ buildInputs = [
SDL SDL_gfx libjpeg libpng SDL SDL_gfx libjpeg libpng
]; ];
in
stdenv.mkDerivation {
inherit (s) name version;
inherit buildInputs;
src = fetchgit { src = fetchgit {
inherit (s) url sha256 rev; inherit (s) url sha256 rev;
}; };