amoeba: init at 1.1

This uses all the patches from Debian since otherwise it would work on
i686 among other things.
This commit is contained in:
Tuomas Tynkkynen 2016-01-10 16:45:25 +02:00 committed by Tuomas Tynkkynen
parent cc442cbdba
commit c86798125b
4 changed files with 84 additions and 0 deletions

View File

@ -0,0 +1,24 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "amoeba-data-${version}";
version = "1.1";
src = fetchurl {
url = "http://http.debian.net/debian/pool/non-free/a/amoeba-data/amoeba-data_${version}.orig.tar.gz";
sha256 = "1bgclr1v63n14bj9nwzm5zxg48nm0cla9bq1rbd5ylxra18k0jbg";
};
installPhase = ''
mkdir -p $out/share/amoeba
cp demo.dat $out/share/amoeba/
'';
meta = with stdenv.lib; {
description = "Fast-paced, polished OpenGL demonstration by Excess (data files)";
homepage = https://packages.qa.debian.org/a/amoeba-data.html;
license = licenses.unfree;
maintainers = [ maintainers.dezgeg ];
platforms = platforms.all;
};
}

View File

@ -0,0 +1,45 @@
{ stdenv, fetchurl, amoeba-data, alsaLib, expat, freetype, gtk2, libvorbis, mesa_glu, pkgconfig }:
stdenv.mkDerivation rec {
name = "amoeba-${version}-${debver}";
version = "1.1";
debver = "29.1";
srcs = [
(fetchurl {
url = "http://http.debian.net/debian/pool/contrib/a/amoeba/amoeba_${version}.orig.tar.gz";
sha256 = "1hyycw4r36ryka2gab9vzkgs8gq4gqhk08vn29cwak95w0rahgim";
})
(fetchurl {
url = "http://http.debian.net/debian/pool/contrib/a/amoeba/amoeba_${version}-${debver}.debian.tar.xz";
sha256 = "1xgi2sqzq97w6hd3dcyq6cka8xmp6nr25qymzhk52cwqh7qb75p3";
})
];
sourceRoot = "amoeba-1.1.orig";
prePatch = ''
patches="${./include-string-h.patch} $(echo ../debian/patches/*.diff)"
'';
postPatch = ''
sed -i packer/pakfile.cpp -e 's|/usr/share/amoeba|${amoeba-data}/share/amoeba|'
sed -i main/linux-config/linux-config.cpp -e 's|libgdk-x11-2.0.so.0|${gtk2}/lib/&|'
sed -i main/linux-config/linux-config.cpp -e 's|libgtk-x11-2.0.so.0|${gtk2}/lib/&|'
'';
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ alsaLib expat freetype gtk2 libvorbis mesa_glu ];
installPhase = ''
mkdir -p $out/bin $out/share/man/man1/
cp amoeba $out/bin/
cp ../debian/amoeba.1 $out/share/man/man1/
'';
meta = with stdenv.lib; {
description = "Fast-paced, polished OpenGL demonstration by Excess";
homepage = https://packages.qa.debian.org/a/amoeba.html;
license = licenses.gpl2; # Engine is GPLv2, data files in amoeba-data nonfree
maintainers = [ maintainers.dezgeg ];
platforms = platforms.linux;
};
}

View File

@ -0,0 +1,12 @@
diff --git a/image/png_image.cpp b/image/png_image.cpp
index 37875fc..1531d6f 100644
--- a/image/png_image.cpp
+++ b/image/png_image.cpp
@@ -4,6 +4,7 @@
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#include <png.h>
#include "png_image.h"

View File

@ -15941,6 +15941,9 @@ with pkgs;
alienarena = callPackage ../games/alienarena { };
amoeba = callPackage ../games/amoeba { };
amoeba-data = callPackage ../games/amoeba/data.nix { };
andyetitmoves = if stdenv.isLinux then callPackage ../games/andyetitmoves {} else null;
angband = callPackage ../games/angband { };