From 0f98d913579ff6377d77b94448174d5d68020f52 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 9 Jun 2007 20:45:01 +0000
Subject: [PATCH] * Latest Generator.

svn path=/nixpkgs/trunk/; revision=8856
---
 pkgs/misc/emulators/generator/default.nix | 10 +++++-----
 pkgs/top-level/all-packages.nix           |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/misc/emulators/generator/default.nix b/pkgs/misc/emulators/generator/default.nix
index 15318de6e486..b4bf72d79d6b 100644
--- a/pkgs/misc/emulators/generator/default.nix
+++ b/pkgs/misc/emulators/generator/default.nix
@@ -1,13 +1,13 @@
-{stdenv, fetchurl, gtk, SDL, nasm}:
+{stdenv, fetchurl, gtk, SDL, nasm, zlib, bzip2, libjpeg}:
 
 stdenv.mkDerivation { 
-  name = "generator-0.35-cbiere-r2";
+  name = "generator-0.35-cbiere-r3";
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/generator-0.35-cbiere-r2.tar.bz2;
-    md5 = "2076c20e0ad1b20d9ac15cab8cb12ad5";
+    url = http://www.ghostwhitecrab.com/generator/generator-0.35-cbiere-r3.tar.bz2;
+    sha256 = "0jw2ibbjyms9sklapnb6pzkmk680zsqq9pd51r2n4957zv1f36jd";
   };
   configureFlags = "--with-gtk --with-raze --with-sdl-audio";
-  buildInputs = [gtk SDL nasm];
+  buildInputs = [gtk SDL nasm zlib bzip2 libjpeg];
   # Only required when not using SDL audio.
 #  patches = [./soundcard.patch];
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 891cd8f8a857..433135c1a1e1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3236,7 +3236,7 @@ rec {
   };
 
   generator = import ../misc/emulators/generator {
-    inherit fetchurl stdenv SDL nasm;
+    inherit fetchurl stdenv SDL nasm zlib bzip2 libjpeg;
     inherit (gtkLibs1x) gtk;
   };