summary refs log tree commit diff
diff options
context:
space:
mode:
authorPascal Wittmann <PascalWittmann@gmx.net>2015-04-26 10:05:14 +0200
committerPascal Wittmann <PascalWittmann@gmx.net>2015-04-26 10:05:14 +0200
commit2f15fcc4c92162766ca81941cd184bc3e93479fa (patch)
tree796b1a0b59827f04548336e645c93d18f41ff532
parent954b8a4cdbe5e7f499ebc7fe189cc1bc3cfa2214 (diff)
parent10dbc6cf3abb2aead783816db95b2e5441044b64 (diff)
downloadnixpkgs-2f15fcc4c92162766ca81941cd184bc3e93479fa.tar
nixpkgs-2f15fcc4c92162766ca81941cd184bc3e93479fa.tar.gz
nixpkgs-2f15fcc4c92162766ca81941cd184bc3e93479fa.tar.bz2
nixpkgs-2f15fcc4c92162766ca81941cd184bc3e93479fa.tar.lz
nixpkgs-2f15fcc4c92162766ca81941cd184bc3e93479fa.tar.xz
nixpkgs-2f15fcc4c92162766ca81941cd184bc3e93479fa.tar.zst
nixpkgs-2f15fcc4c92162766ca81941cd184bc3e93479fa.zip
Merge pull request #7389 from AndersonTorres/atari++
Atari++: 1.46 -> 1.73
-rw-r--r--pkgs/misc/emulators/atari++/default.nix35
1 files changed, 24 insertions, 11 deletions
diff --git a/pkgs/misc/emulators/atari++/default.nix b/pkgs/misc/emulators/atari++/default.nix
index 1a76ddd1c90..89baadb6208 100644
--- a/pkgs/misc/emulators/atari++/default.nix
+++ b/pkgs/misc/emulators/atari++/default.nix
@@ -1,15 +1,28 @@
-{stdenv, fetchurl, x11, SDL}:
+{ stdenv, fetchurl
+, libX11, SDL }:
+
+with stdenv.lib;
+stdenv.mkDerivation rec{
+  name = "atari++-${version}";
+  version = "1.73";
 
-stdenv.mkDerivation {
-  name = "atari++-1.46";
-#  builder = ./builder.sh;
   src = fetchurl {
-    url = http://www.math.tu-berlin.de/~thor/atari++/download/atari++.tgz;
-    md5 = "0619ec6b63852233111aa0bd263c8ea2";
+    url = "http://www.xl-project.com/download/atari++_${version}.tar.gz";
+    sha256 = "1y5kwh08717jsa5agxrvxnggnwxq36irrid9rzfhca1nnvp9a45l";
   };
-#  rom = fetchurl {
-#    url = mirror://sourceforge/atari800/xf25.zip;
-#    md5 = "4dc3b6b4313e9596c4d474785a37b94d";
-#  };
-  buildInputs = [x11 SDL];
+
+  buildInputs = [ libX11 SDL ];
+  meta = {
+    homepage = http://www.xl-project.com/;
+    description = "An enhanced, cycle-accurated Atari emulator";
+    longDescription = ''
+      The Atari++ Emulator is a Unix based emulator of the Atari eight
+      bit computers, namely the Atari 400 and 800, the Atari 400XL,
+      800XL and 130XE, and the Atari 5200 game console. The emulator
+      is auto-configurable and will compile on a variety of systems
+      (Linux, Solaris, Irix).
+    '';
+    maintainers = [ maintainers.AndersonTorres ];
+    license = licenses.gpl2Plus;    
+  };    
 }