From 9c94b20629bedd8fd5a6e306827b5d2bcc9d7620 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sat, 31 Oct 2009 12:59:33 +0000 Subject: Try using Gnome-2.28 svn path=/nixpkgs/branches/xorg-7.5/; revision=18058 --- pkgs/top-level/all-packages.nix | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7a5b7d37d6ac6..a093bca740a88 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8286,23 +8286,12 @@ let inherit stdenv fetchurl pkgconfig x11 xlibs dbus imlib2 freetype; }; - gnome = recurseIntoAttrs (import ../desktops/gnome { - inherit - fetchurl stdenv pkgconfig - flex bison popt zlib libxml2 libxslt - perl perlXMLParser docbook_xml_dtd_42 docbook_xml_dtd_412 - docbook_xml_dtd_43 - gettext x11 libtiff libjpeg libpng gtkLibs xlibs bzip2 - libcm python dbus dbus_glib ncurses which libxml2Python - iconnamingutils openssl hal samba fam libgcrypt libtasn1 - xmlto docbook2x docbook_xsl intltool enchant isocodes polkit - libproxy sqlite; - }); - gnome26 = import ../desktops/gnome-2.26 pkgs; gnome28 = import ../desktops/gnome-2.28 pkgs; + gnome = gnome28; + kde3 = { kdelibs = import ../desktops/kde-3/kdelibs { -- cgit 1.4.1