From 019472eaa34c93186dbdbe4b18c90c1f566c700a Mon Sep 17 00:00:00 2001
From: Jordi <logann2019@gmail.com>
Date: Mon, 22 Apr 2013 22:10:15 +0200
Subject: [PATCH 1/2] Add hatari Atari St emulator.

---
 pkgs/misc/emulators/hatari/default.nix | 19 +++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  2 ++
 2 files changed, 21 insertions(+)
 create mode 100644 pkgs/misc/emulators/hatari/default.nix

diff --git a/pkgs/misc/emulators/hatari/default.nix b/pkgs/misc/emulators/hatari/default.nix
new file mode 100644
index 00000000000..a77bb1f89c9
--- /dev/null
+++ b/pkgs/misc/emulators/hatari/default.nix
@@ -0,0 +1,19 @@
+{stdenv, fetchurl, zlib, SDL, cmake}:
+
+let
+  name = "hatari-1.6.2";
+in
+stdenv.mkDerivation {
+  inherit name; 
+  src = fetchurl {
+    url = "http://download.tuxfamily.org/hatari/1.6.2/${name}.tar.bz2";
+    sha256 = "0gqvfqqd0lg3hi261rwh6gi2b5kmza480kfzx43d4l49xcq09pi0";
+  };
+  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;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 60096ca007b..89c26325fed 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8959,6 +8959,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

From 7ca16e51151dab8d7a21c81b90f458d617f62d5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Tue, 23 Apr 2013 11:05:46 +0400
Subject: [PATCH 2/2] hatari: fix pthread_cancel+gcc_s thing, and some spacing

---
 pkgs/misc/emulators/hatari/default.nix | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/misc/emulators/hatari/default.nix b/pkgs/misc/emulators/hatari/default.nix
index a77bb1f89c9..e4eeff9cd54 100644
--- a/pkgs/misc/emulators/hatari/default.nix
+++ b/pkgs/misc/emulators/hatari/default.nix
@@ -1,15 +1,18 @@
-{stdenv, fetchurl, zlib, SDL, cmake}:
+{ stdenv, fetchurl, zlib, SDL, cmake }:
 
-let
+stdenv.mkDerivation rec {
   name = "hatari-1.6.2";
-in
-stdenv.mkDerivation {
-  inherit name; 
+
   src = fetchurl {
     url = "http://download.tuxfamily.org/hatari/1.6.2/${name}.tar.bz2";
     sha256 = "0gqvfqqd0lg3hi261rwh6gi2b5kmza480kfzx43d4l49xcq09pi0";
   };
-  buildInputs = [zlib SDL cmake];
+
+  # 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.";