public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #36649 from pbogdan/pingus-fix-build 

pingus: fix build with gcc7
This commit is contained in:
Michael Raskin 2018-03-09 17:42:18 +00:00 committed by GitHub
parent 72dede4203 2dfeb6fc53
commit 36fd566372
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/games/pingus/default.nix
View File

@ -1,5 +1,5 @@
{stdenv, fetchurl, scons, SDL, SDL_image, boost, libpng, SDL_mixer, pkgconfig {stdenv, fetchurl, fetchpatch, scons, SDL, SDL_image, boost, libpng, SDL_mixer
, libGLU_combined}: , pkgconfig, libGLU_combined}:
let let
s = # Generated upstream information s = # Generated upstream information
rec { rec {
@ -18,6 +18,13 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
inherit (s) url sha256; inherit (s) url sha256;
}; };
patches = [
# fix build with gcc7
(fetchpatch {
url = https://github.com/Pingus/pingus/commit/df6e2f445d3e2925a94d22faeb17be9444513e92.patch;
sha256 = "0nqyhznnnvpgfa6rfv8rapjfpw99b67n97jfqp9r3hpib1b3ja6p";
})
];
makeFlags = '' PREFIX="$(out)" ''; makeFlags = '' PREFIX="$(out)" '';
meta = { meta = {
inherit (s) version; inherit (s) version;