* Added SDL, Simple DirectMedia Layer.

* Added NASM, the Netwide Assembler.
* Added Generator, an emulator for Sega Genesis / Mega Drive machines.
  Built with XVideo patch. Strangely it crashes with a GDK error when
  started in normal mode.  However, with the "-a" switch (arcade mode)
  it works, and subsequently switching back to windowed mode (Ctrl-F)
  also works.

svn path=/nixpkgs/trunk/; revision=1509

1 files changed, 16 insertions, 0 deletions

diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index ccd84368438..75077c923f0 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -159,6 +159,7 @@ rec {
     inherit fetchurl stdenv;
   };
 
+  
   ### SHELLS
 
   bash = (import ../shells/bash) {
@@ -420,6 +421,10 @@ rec {
     inherit fetchurl stdenv unzip ghc happy;
   };
 
+  nasm = (import ../development/compilers/nasm) {
+    inherit fetchurl stdenv;
+  };
+
   realPerl = (import ../development/interpreters/perl) {
     inherit fetchurl stdenv;
   };
@@ -666,6 +671,10 @@ rec {
     inherit fetchurl stdenv ncurses;
   };
 
+  SDL = (import ../development/libraries/SDL) {
+    inherit fetchurl stdenv x11;
+  };
+
 
   ### SERVERS
 
@@ -691,6 +700,7 @@ rec {
     inherit fetchurl stdenv;
   };
 
+  
   ### OS-SPECIFIC
 
   kernelHeaders = (import ../os-specific/linux/kernel-headers) {
@@ -726,6 +736,7 @@ rec {
     glibc = stdenv.gcc.glibc;
   };
 
+  
   ### DATA
 
   docbook_xml_dtd_42 = (import ../data/sgml+xml/schemas/xml-dtd/docbook-4.2) {
@@ -873,6 +884,11 @@ rec {
     inherit fetchurl stdenv xlibs mesa;
   };
 
+  generator = (import ../games/generator) {
+    inherit fetchurl stdenv SDL nasm;
+    inherit (gtkLibs1x) gtk;
+  };
+
 
   ### MISC