From f6f102f9b3cd0f56b7388defbb04ea88e8dc3230 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 3 Nov 2004 21:28:03 +0000
Subject: [PATCH] * Gnome: use GTK 2.4.

svn path=/nixpkgs/trunk/; revision=1671
---
 pkgs/system/all-packages-generic.nix | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index a8688fd578a..5805d56d624 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -584,8 +584,7 @@ rec {
   gnome = import ../development/libraries/gnome {
     inherit fetchurl stdenv pkgconfig audiofile
             flex bison popt perl zlib libxml2 bzip2
-            perlXMLParser;
-    gtkLibs = gtkLibs22;
+            perlXMLParser gtkLibs;
   };
 
   wxGTK = (import ../development/libraries/wxGTK-2.5) {
@@ -935,6 +934,16 @@ rec {
     inherit fetchurl stdenv;
   };
 
+  /*
+  atari800 = (import ../misc/emulators/atari800) {
+    inherit fetchurl stdenv zlib SDL;
+  };
+
+  ataripp = (import ../misc/emulators/atari++) {
+    inherit fetchurl stdenv x11 SDL;
+  };
+  */
+
   nix = (import ../misc/nix) {
     inherit fetchurl stdenv aterm perl;
     curl = bootCurl; /* !!! ugly */