From 7ca16e51151dab8d7a21c81b90f458d617f62d5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 23 Apr 2013 11:05:46 +0400 Subject: [PATCH] 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.";