pingus, quirc: fix pkgconfig passing
This commit is contained in:
parent
e71a6aabf8
commit
ef291b52f3
|
@ -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;
|
||||||
};
|
};
|
||||||
|
|
|
@ -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;
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue