Merge branch of 'hatari'

This commit is contained in:
Lluís Batlle i Rossell 2013-04-23 11:06:17 +04:00
commit 031d1ee8c5
2 changed files with 24 additions and 0 deletions

View File

@ -0,0 +1,22 @@
{ stdenv, fetchurl, zlib, SDL, cmake }:
stdenv.mkDerivation rec {
name = "hatari-1.6.2";
src = fetchurl {
url = "http://download.tuxfamily.org/hatari/1.6.2/${name}.tar.bz2";
sha256 = "0gqvfqqd0lg3hi261rwh6gi2b5kmza480kfzx43d4l49xcq09pi0";
};
# For pthread_cancel
cmakeFlags = "-DCMAKE_EXE_LINKER_FLAGS=-lgcc_s";
buildInputs = [ zlib SDL cmake ];
meta = {
homepage = "http://hatari.tuxfamily.org/";
description = "Hatari is an Atari ST/STE/TT/Falcon emulator.";
license = "GPLv2+";
platforms = with stdenv.lib.platforms; all;
};
}

View File

@ -8976,6 +8976,8 @@ let
gxemul = callPackage ../misc/gxemul { };
hatari = callPackage ../misc/emulators/hatari { };
hplip = callPackage ../misc/drivers/hplip { };
# using the new configuration style proposal which is unstable