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

Merge pull request #83706 from 7c6f434c/pingus-fix

Browse Source 
pingus: 0.7.6 -> unstable; fixes build conflicts with dependency updates
This commit is contained in:
Michael Raskin 2020-03-29 20:03:49 +00:00 committed by GitHub
commit 8cd343edf8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,38 +1,22 @@
{stdenv, fetchurl, fetchpatch, scons, SDL, SDL_image, boost, libpng, SDL_mixer {stdenv, fetchgit, cmake, SDL2, SDL2_image, boost, libpng, SDL2_mixer
, pkgconfig, libGLU, libGL}: , pkgconfig, libGLU, libGL, git, jsoncpp }:
let stdenv.mkDerivation rec {
s = # Generated upstream information pname = "pingus";
{ version = "unstable-0.7.6.0.20191104";
baseName="pingus";
version="0.7.6"; nativeBuildInputs = [ pkgconfig git ];
name="pingus-0.7.6"; buildInputs = [ cmake SDL2 SDL2_image boost libpng SDL2_mixer libGLU libGL jsoncpp ];
hash="0q34d2k6anzqvb0mf67x85q92lfx9jr71ry13dlp47jx0x9i573m"; src = fetchgit {
url="http://pingus.googlecode.com/files/pingus-0.7.6.tar.bz2"; url = "https://gitlab.com/pingus/pingus/";
sha256="0q34d2k6anzqvb0mf67x85q92lfx9jr71ry13dlp47jx0x9i573m"; rev = "709546d9b9c4d6d5f45fc9112b45ac10c7f9417d";
sha256 = "sha256:11mmzk0766riaw5qyd1r5i7s7vczbbzfccm92bvgrm99iy1sj022";
fetchSubmodules = true;
}; };
in
stdenv.mkDerivation {
inherit (s) name version;
nativeBuildInputs = [ pkgconfig ];
buildInputs = [scons SDL SDL_image boost libpng SDL_mixer libGLU libGL];
src = fetchurl {
inherit (s) url sha256;
};
patches = [
# fix build with gcc7
(fetchpatch {
url = https://github.com/Pingus/pingus/commit/df6e2f445d3e2925a94d22faeb17be9444513e92.patch;
sha256 = "0nqyhznnnvpgfa6rfv8rapjfpw99b67n97jfqp9r3hpib1b3ja6p";
})
];
makeFlags = [ "PREFIX=${placeholder "out"}" ];
dontUseSconsInstall = true;
meta = { meta = {
inherit (s) version;
description = ''A puzzle game with mechanics similar to Lemmings''; description = ''A puzzle game with mechanics similar to Lemmings'';
platforms = stdenv.lib.platforms.linux; platforms = stdenv.lib.platforms.linux;
maintainers = [stdenv.lib.maintainers.raskin]; maintainers = [stdenv.lib.maintainers.raskin];
license = stdenv.lib.licenses.gpl3; license = stdenv.lib.licenses.gpl3;
broken = true; # Broken since 2019-11-20 (https://hydra.nixos.org/build/114721280)
}; };
} }

1
pkgs/games/pingus/default.upstream
View File

@ -1 +0,0 @@
url http://pingus.seul.org/download.html