diff options
author | Alyssa Ross <hi@alyssa.is> | 2020-04-27 21:04:56 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2020-04-27 21:04:56 +0000 |
commit | a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e (patch) | |
tree | 47950e79183035018882419c4eff5047d1537b99 /nixpkgs/pkgs/games/pingus | |
parent | 5b00523fb58512232b819a301c4309f579c7f09c (diff) | |
parent | 22a3bf9fb9edad917fb6cd1066d58b5e426ee975 (diff) | |
download | nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.tar nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.tar.gz nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.tar.bz2 nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.tar.lz nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.tar.xz nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.tar.zst nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.zip |
Merge commit '22a3bf9fb9edad917fb6cd1066d58b5e426ee975'
Diffstat (limited to 'nixpkgs/pkgs/games/pingus')
-rw-r--r-- | nixpkgs/pkgs/games/pingus/default.nix | 43 | ||||
-rw-r--r-- | nixpkgs/pkgs/games/pingus/default.upstream | 1 |
2 files changed, 14 insertions, 30 deletions
diff --git a/nixpkgs/pkgs/games/pingus/default.nix b/nixpkgs/pkgs/games/pingus/default.nix index 628493a34b1b..6ffc38f6700f 100644 --- a/nixpkgs/pkgs/games/pingus/default.nix +++ b/nixpkgs/pkgs/games/pingus/default.nix @@ -1,34 +1,19 @@ -{stdenv, fetchurl, fetchpatch, scons, SDL, SDL_image, boost, libpng, SDL_mixer -, pkgconfig, libGLU, libGL}: -let - s = # Generated upstream information - { - baseName="pingus"; - version="0.7.6"; - name="pingus-0.7.6"; - hash="0q34d2k6anzqvb0mf67x85q92lfx9jr71ry13dlp47jx0x9i573m"; - url="http://pingus.googlecode.com/files/pingus-0.7.6.tar.bz2"; - sha256="0q34d2k6anzqvb0mf67x85q92lfx9jr71ry13dlp47jx0x9i573m"; +{stdenv, fetchgit, cmake, SDL2, SDL2_image, boost, libpng, SDL2_mixer +, pkgconfig, libGLU, libGL, git, jsoncpp }: +stdenv.mkDerivation rec { + pname = "pingus"; + version = "unstable-0.7.6.0.20191104"; + + nativeBuildInputs = [ cmake pkgconfig git ]; + buildInputs = [ SDL2 SDL2_image boost libpng SDL2_mixer libGLU libGL jsoncpp ]; + src = fetchgit { + url = "https://gitlab.com/pingus/pingus/"; + 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 = { - inherit (s) version; description = ''A puzzle game with mechanics similar to Lemmings''; platforms = stdenv.lib.platforms.linux; maintainers = [stdenv.lib.maintainers.raskin]; diff --git a/nixpkgs/pkgs/games/pingus/default.upstream b/nixpkgs/pkgs/games/pingus/default.upstream deleted file mode 100644 index 6b4eb31aa5f6..000000000000 --- a/nixpkgs/pkgs/games/pingus/default.upstream +++ /dev/null @@ -1 +0,0 @@ -url http://pingus.seul.org/download.html |