From 398768bfb566c31b50576561878561467d3a6013 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 28 Feb 2007 16:18:58 +0000 Subject: [PATCH] * Refactoring: move KDE and Gnome out of development/libraries into desktops. svn path=/nixpkgs/trunk/; revision=8105 --- .../gnome/GConf/default.nix | 0 .../gnome/ORBit2/default.nix | 0 .../libraries => desktops}/gnome/default.nix | 0 .../gnome/esound/default.nix | 0 .../gnome/gail/default.nix | 0 .../gnome/gnome-desktop/default.nix | 0 .../gnome/gnome-icon-theme/default.nix | 0 .../gnome-icon-theme-2.14.2.patch | 0 .../gnome/gnome-keyring/default.nix | 0 .../gnome/gnome-mime-data/default.nix | 0 .../gnome/gnome-panel/default.nix | 0 .../gnome/gnome-vfs/default.nix | 0 .../gnome/gnome-vfs/no-kerberos.patch | 0 .../gnome/gtkhtml/default.nix | 0 .../gnome/gtksourceview/default.nix | 0 .../gnome/imlib/default.nix | 0 .../gnome/intltool/default.nix | 0 .../gnome/libIDL/default.nix | 0 .../gnome/libart_lgpl/default.nix | 0 .../gnome/libbonobo/default.nix | 0 .../gnome/libbonoboui/default.nix | 0 .../gnome/libglade/default.nix | 0 .../gnome/libgnome/default.nix | 0 .../gnome/libgnomecanvas/default.nix | 0 .../gnome/libgnomeprint/default.nix | 0 .../gnome/libgnomeprintui/default.nix | 0 .../gnome/libgnomeui/default.nix | 0 .../gnome/libgtkhtml/default.nix | 0 .../gnome/libsoup/default.nix | 0 .../gnome/libwnck/default.nix | 0 .../gnome/make-listing.pl | 0 .../gnome/scrollkeeper/default.nix | 0 .../gnome/scrollkeeper/xmlcatalog.patch | 0 .../gnome/src-gnome-desktop-2.14.3.nix | 0 .../gnome/src-gnome-platform-2.14.3.nix | 0 .../gnome/startup-notification/default.nix | 0 .../kde/arts/default.nix | 0 .../kde/kdelibs/default.nix | 0 pkgs/development/libraries/arts/default.nix | 22 ++++++++++ pkgs/top-level/all-packages.nix | 42 ++++++++++--------- 40 files changed, 45 insertions(+), 19 deletions(-) rename pkgs/{development/libraries => desktops}/gnome/GConf/default.nix (100%) rename pkgs/{development/libraries => desktops}/gnome/ORBit2/default.nix (100%) rename pkgs/{development/libraries => desktops}/gnome/default.nix (100%) rename pkgs/{development/libraries => desktops}/gnome/esound/default.nix (100%) rename pkgs/{development/libraries => desktops}/gnome/gail/default.nix (100%) rename pkgs/{development/libraries => desktops}/gnome/gnome-desktop/default.nix (100%) rename pkgs/{development/libraries => desktops}/gnome/gnome-icon-theme/default.nix (100%) rename pkgs/{development/libraries => desktops}/gnome/gnome-icon-theme/gnome-icon-theme-2.14.2.patch (100%) rename pkgs/{development/libraries => desktops}/gnome/gnome-keyring/default.nix (100%) rename pkgs/{development/libraries => desktops}/gnome/gnome-mime-data/default.nix (100%) rename pkgs/{development/libraries => desktops}/gnome/gnome-panel/default.nix (100%) rename pkgs/{development/libraries => desktops}/gnome/gnome-vfs/default.nix (100%) rename pkgs/{development/libraries => desktops}/gnome/gnome-vfs/no-kerberos.patch (100%) rename pkgs/{development/libraries => desktops}/gnome/gtkhtml/default.nix (100%) rename pkgs/{development/libraries => desktops}/gnome/gtksourceview/default.nix (100%) rename pkgs/{development/libraries => desktops}/gnome/imlib/default.nix (100%) rename pkgs/{development/libraries => desktops}/gnome/intltool/default.nix (100%) rename pkgs/{development/libraries => desktops}/gnome/libIDL/default.nix (100%) rename pkgs/{development/libraries => desktops}/gnome/libart_lgpl/default.nix (100%) rename pkgs/{development/libraries => desktops}/gnome/libbonobo/default.nix (100%) rename pkgs/{development/libraries => desktops}/gnome/libbonoboui/default.nix (100%) rename pkgs/{development/libraries => desktops}/gnome/libglade/default.nix (100%) rename pkgs/{development/libraries => desktops}/gnome/libgnome/default.nix (100%) rename pkgs/{development/libraries => desktops}/gnome/libgnomecanvas/default.nix (100%) rename pkgs/{development/libraries => desktops}/gnome/libgnomeprint/default.nix (100%) rename pkgs/{development/libraries => desktops}/gnome/libgnomeprintui/default.nix (100%) rename pkgs/{development/libraries => desktops}/gnome/libgnomeui/default.nix (100%) rename pkgs/{development/libraries => desktops}/gnome/libgtkhtml/default.nix (100%) rename pkgs/{development/libraries => desktops}/gnome/libsoup/default.nix (100%) rename pkgs/{development/libraries => desktops}/gnome/libwnck/default.nix (100%) rename pkgs/{development/libraries => desktops}/gnome/make-listing.pl (100%) rename pkgs/{development/libraries => desktops}/gnome/scrollkeeper/default.nix (100%) rename pkgs/{development/libraries => desktops}/gnome/scrollkeeper/xmlcatalog.patch (100%) rename pkgs/{development/libraries => desktops}/gnome/src-gnome-desktop-2.14.3.nix (100%) rename pkgs/{development/libraries => desktops}/gnome/src-gnome-platform-2.14.3.nix (100%) rename pkgs/{development/libraries => desktops}/gnome/startup-notification/default.nix (100%) rename pkgs/{development/libraries => desktops}/kde/arts/default.nix (100%) rename pkgs/{development/libraries => desktops}/kde/kdelibs/default.nix (100%) create mode 100644 pkgs/development/libraries/arts/default.nix diff --git a/pkgs/development/libraries/gnome/GConf/default.nix b/pkgs/desktops/gnome/GConf/default.nix similarity index 100% rename from pkgs/development/libraries/gnome/GConf/default.nix rename to pkgs/desktops/gnome/GConf/default.nix diff --git a/pkgs/development/libraries/gnome/ORBit2/default.nix b/pkgs/desktops/gnome/ORBit2/default.nix similarity index 100% rename from pkgs/development/libraries/gnome/ORBit2/default.nix rename to pkgs/desktops/gnome/ORBit2/default.nix diff --git a/pkgs/development/libraries/gnome/default.nix b/pkgs/desktops/gnome/default.nix similarity index 100% rename from pkgs/development/libraries/gnome/default.nix rename to pkgs/desktops/gnome/default.nix diff --git a/pkgs/development/libraries/gnome/esound/default.nix b/pkgs/desktops/gnome/esound/default.nix similarity index 100% rename from pkgs/development/libraries/gnome/esound/default.nix rename to pkgs/desktops/gnome/esound/default.nix diff --git a/pkgs/development/libraries/gnome/gail/default.nix b/pkgs/desktops/gnome/gail/default.nix similarity index 100% rename from pkgs/development/libraries/gnome/gail/default.nix rename to pkgs/desktops/gnome/gail/default.nix diff --git a/pkgs/development/libraries/gnome/gnome-desktop/default.nix b/pkgs/desktops/gnome/gnome-desktop/default.nix similarity index 100% rename from pkgs/development/libraries/gnome/gnome-desktop/default.nix rename to pkgs/desktops/gnome/gnome-desktop/default.nix diff --git a/pkgs/development/libraries/gnome/gnome-icon-theme/default.nix b/pkgs/desktops/gnome/gnome-icon-theme/default.nix similarity index 100% rename from pkgs/development/libraries/gnome/gnome-icon-theme/default.nix rename to pkgs/desktops/gnome/gnome-icon-theme/default.nix diff --git a/pkgs/development/libraries/gnome/gnome-icon-theme/gnome-icon-theme-2.14.2.patch b/pkgs/desktops/gnome/gnome-icon-theme/gnome-icon-theme-2.14.2.patch similarity index 100% rename from pkgs/development/libraries/gnome/gnome-icon-theme/gnome-icon-theme-2.14.2.patch rename to pkgs/desktops/gnome/gnome-icon-theme/gnome-icon-theme-2.14.2.patch diff --git a/pkgs/development/libraries/gnome/gnome-keyring/default.nix b/pkgs/desktops/gnome/gnome-keyring/default.nix similarity index 100% rename from pkgs/development/libraries/gnome/gnome-keyring/default.nix rename to pkgs/desktops/gnome/gnome-keyring/default.nix diff --git a/pkgs/development/libraries/gnome/gnome-mime-data/default.nix b/pkgs/desktops/gnome/gnome-mime-data/default.nix similarity index 100% rename from pkgs/development/libraries/gnome/gnome-mime-data/default.nix rename to pkgs/desktops/gnome/gnome-mime-data/default.nix diff --git a/pkgs/development/libraries/gnome/gnome-panel/default.nix b/pkgs/desktops/gnome/gnome-panel/default.nix similarity index 100% rename from pkgs/development/libraries/gnome/gnome-panel/default.nix rename to pkgs/desktops/gnome/gnome-panel/default.nix diff --git a/pkgs/development/libraries/gnome/gnome-vfs/default.nix b/pkgs/desktops/gnome/gnome-vfs/default.nix similarity index 100% rename from pkgs/development/libraries/gnome/gnome-vfs/default.nix rename to pkgs/desktops/gnome/gnome-vfs/default.nix diff --git a/pkgs/development/libraries/gnome/gnome-vfs/no-kerberos.patch b/pkgs/desktops/gnome/gnome-vfs/no-kerberos.patch similarity index 100% rename from pkgs/development/libraries/gnome/gnome-vfs/no-kerberos.patch rename to pkgs/desktops/gnome/gnome-vfs/no-kerberos.patch diff --git a/pkgs/development/libraries/gnome/gtkhtml/default.nix b/pkgs/desktops/gnome/gtkhtml/default.nix similarity index 100% rename from pkgs/development/libraries/gnome/gtkhtml/default.nix rename to pkgs/desktops/gnome/gtkhtml/default.nix diff --git a/pkgs/development/libraries/gnome/gtksourceview/default.nix b/pkgs/desktops/gnome/gtksourceview/default.nix similarity index 100% rename from pkgs/development/libraries/gnome/gtksourceview/default.nix rename to pkgs/desktops/gnome/gtksourceview/default.nix diff --git a/pkgs/development/libraries/gnome/imlib/default.nix b/pkgs/desktops/gnome/imlib/default.nix similarity index 100% rename from pkgs/development/libraries/gnome/imlib/default.nix rename to pkgs/desktops/gnome/imlib/default.nix diff --git a/pkgs/development/libraries/gnome/intltool/default.nix b/pkgs/desktops/gnome/intltool/default.nix similarity index 100% rename from pkgs/development/libraries/gnome/intltool/default.nix rename to pkgs/desktops/gnome/intltool/default.nix diff --git a/pkgs/development/libraries/gnome/libIDL/default.nix b/pkgs/desktops/gnome/libIDL/default.nix similarity index 100% rename from pkgs/development/libraries/gnome/libIDL/default.nix rename to pkgs/desktops/gnome/libIDL/default.nix diff --git a/pkgs/development/libraries/gnome/libart_lgpl/default.nix b/pkgs/desktops/gnome/libart_lgpl/default.nix similarity index 100% rename from pkgs/development/libraries/gnome/libart_lgpl/default.nix rename to pkgs/desktops/gnome/libart_lgpl/default.nix diff --git a/pkgs/development/libraries/gnome/libbonobo/default.nix b/pkgs/desktops/gnome/libbonobo/default.nix similarity index 100% rename from pkgs/development/libraries/gnome/libbonobo/default.nix rename to pkgs/desktops/gnome/libbonobo/default.nix diff --git a/pkgs/development/libraries/gnome/libbonoboui/default.nix b/pkgs/desktops/gnome/libbonoboui/default.nix similarity index 100% rename from pkgs/development/libraries/gnome/libbonoboui/default.nix rename to pkgs/desktops/gnome/libbonoboui/default.nix diff --git a/pkgs/development/libraries/gnome/libglade/default.nix b/pkgs/desktops/gnome/libglade/default.nix similarity index 100% rename from pkgs/development/libraries/gnome/libglade/default.nix rename to pkgs/desktops/gnome/libglade/default.nix diff --git a/pkgs/development/libraries/gnome/libgnome/default.nix b/pkgs/desktops/gnome/libgnome/default.nix similarity index 100% rename from pkgs/development/libraries/gnome/libgnome/default.nix rename to pkgs/desktops/gnome/libgnome/default.nix diff --git a/pkgs/development/libraries/gnome/libgnomecanvas/default.nix b/pkgs/desktops/gnome/libgnomecanvas/default.nix similarity index 100% rename from pkgs/development/libraries/gnome/libgnomecanvas/default.nix rename to pkgs/desktops/gnome/libgnomecanvas/default.nix diff --git a/pkgs/development/libraries/gnome/libgnomeprint/default.nix b/pkgs/desktops/gnome/libgnomeprint/default.nix similarity index 100% rename from pkgs/development/libraries/gnome/libgnomeprint/default.nix rename to pkgs/desktops/gnome/libgnomeprint/default.nix diff --git a/pkgs/development/libraries/gnome/libgnomeprintui/default.nix b/pkgs/desktops/gnome/libgnomeprintui/default.nix similarity index 100% rename from pkgs/development/libraries/gnome/libgnomeprintui/default.nix rename to pkgs/desktops/gnome/libgnomeprintui/default.nix diff --git a/pkgs/development/libraries/gnome/libgnomeui/default.nix b/pkgs/desktops/gnome/libgnomeui/default.nix similarity index 100% rename from pkgs/development/libraries/gnome/libgnomeui/default.nix rename to pkgs/desktops/gnome/libgnomeui/default.nix diff --git a/pkgs/development/libraries/gnome/libgtkhtml/default.nix b/pkgs/desktops/gnome/libgtkhtml/default.nix similarity index 100% rename from pkgs/development/libraries/gnome/libgtkhtml/default.nix rename to pkgs/desktops/gnome/libgtkhtml/default.nix diff --git a/pkgs/development/libraries/gnome/libsoup/default.nix b/pkgs/desktops/gnome/libsoup/default.nix similarity index 100% rename from pkgs/development/libraries/gnome/libsoup/default.nix rename to pkgs/desktops/gnome/libsoup/default.nix diff --git a/pkgs/development/libraries/gnome/libwnck/default.nix b/pkgs/desktops/gnome/libwnck/default.nix similarity index 100% rename from pkgs/development/libraries/gnome/libwnck/default.nix rename to pkgs/desktops/gnome/libwnck/default.nix diff --git a/pkgs/development/libraries/gnome/make-listing.pl b/pkgs/desktops/gnome/make-listing.pl similarity index 100% rename from pkgs/development/libraries/gnome/make-listing.pl rename to pkgs/desktops/gnome/make-listing.pl diff --git a/pkgs/development/libraries/gnome/scrollkeeper/default.nix b/pkgs/desktops/gnome/scrollkeeper/default.nix similarity index 100% rename from pkgs/development/libraries/gnome/scrollkeeper/default.nix rename to pkgs/desktops/gnome/scrollkeeper/default.nix diff --git a/pkgs/development/libraries/gnome/scrollkeeper/xmlcatalog.patch b/pkgs/desktops/gnome/scrollkeeper/xmlcatalog.patch similarity index 100% rename from pkgs/development/libraries/gnome/scrollkeeper/xmlcatalog.patch rename to pkgs/desktops/gnome/scrollkeeper/xmlcatalog.patch diff --git a/pkgs/development/libraries/gnome/src-gnome-desktop-2.14.3.nix b/pkgs/desktops/gnome/src-gnome-desktop-2.14.3.nix similarity index 100% rename from pkgs/development/libraries/gnome/src-gnome-desktop-2.14.3.nix rename to pkgs/desktops/gnome/src-gnome-desktop-2.14.3.nix diff --git a/pkgs/development/libraries/gnome/src-gnome-platform-2.14.3.nix b/pkgs/desktops/gnome/src-gnome-platform-2.14.3.nix similarity index 100% rename from pkgs/development/libraries/gnome/src-gnome-platform-2.14.3.nix rename to pkgs/desktops/gnome/src-gnome-platform-2.14.3.nix diff --git a/pkgs/development/libraries/gnome/startup-notification/default.nix b/pkgs/desktops/gnome/startup-notification/default.nix similarity index 100% rename from pkgs/development/libraries/gnome/startup-notification/default.nix rename to pkgs/desktops/gnome/startup-notification/default.nix diff --git a/pkgs/development/libraries/kde/arts/default.nix b/pkgs/desktops/kde/arts/default.nix similarity index 100% rename from pkgs/development/libraries/kde/arts/default.nix rename to pkgs/desktops/kde/arts/default.nix diff --git a/pkgs/development/libraries/kde/kdelibs/default.nix b/pkgs/desktops/kde/kdelibs/default.nix similarity index 100% rename from pkgs/development/libraries/kde/kdelibs/default.nix rename to pkgs/desktops/kde/kdelibs/default.nix diff --git a/pkgs/development/libraries/arts/default.nix b/pkgs/development/libraries/arts/default.nix new file mode 100644 index 000000000000..4fdd914ccffa --- /dev/null +++ b/pkgs/development/libraries/arts/default.nix @@ -0,0 +1,22 @@ +{stdenv, fetchurl, pkgconfig, glib, kdelibs, libX11, libXext, zlib, libjpeg, libpng, perl, qt}: + +stdenv.mkDerivation { + name = "arts-1.5.4"; + + KDEDIR = kdelibs; + configureFlags = " + --with-extra-includes=${libjpeg}/include + --with-extra-libs=${libjpeg}/lib + --x-includes=${libX11}/include + --x-libraries=${libX11}/lib"; + + src = fetchurl { + url = http://nix.cs.uu.nl/dist/tarballs/arts-1.5.4.tar.bz2; + md5 = "886ba4a13dc0da312d94c09f50c3ffe6"; + }; + + buildInputs = [pkgconfig glib kdelibs libX11 libXext zlib libjpeg libpng perl qt]; + +} + + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0653636fcf3a..0fca820bc830 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1204,7 +1204,7 @@ rec { bdbSupport = true; }; - arts = import ../development/libraries/kde/arts { + arts = import ../development/libraries/arts { inherit fetchurl stdenv pkgconfig; inherit (xlibs) libX11 libXext; inherit kdelibs zlib libjpeg libpng perl; @@ -1337,15 +1337,6 @@ rec { inherit (gtkLibs) glib; }; - gnome = recurseIntoAttrs (import ../development/libraries/gnome { - inherit fetchurl stdenv pkgconfig audiofile - flex bison popt zlib libxml2 libxslt - perl perlXMLParser docbook_xml_dtd_42 gettext x11 - libtiff libjpeg libpng bzip2; - gtkLibs = gtkLibs210; # !!! correct? - inherit (xlibs) libXmu; - }); - gpgme = import ../development/libraries/gpgme { inherit fetchurl stdenv libgpgerror gnupg; }; @@ -1426,15 +1417,6 @@ rec { inherit (xlibs) libX11 libXext xextproto; }; - kdelibs = import ../development/libraries/kde/kdelibs { - inherit - fetchurl stdenv zlib perl openssl pcre pkgconfig - libjpeg libpng libtiff libxml2 libxslt libtool - expat freetype bzip2; - inherit (xlibs) libX11 libXt libXext; - qt = qt3; - }; - lcms = import ../development/libraries/lcms { inherit fetchurl stdenv; }; @@ -3021,6 +3003,28 @@ rec { }; + ### DESKTOP ENVIRONMENTS + + + gnome = recurseIntoAttrs (import ../desktops/gnome { + inherit fetchurl stdenv pkgconfig audiofile + flex bison popt zlib libxml2 libxslt + perl perlXMLParser docbook_xml_dtd_42 gettext x11 + libtiff libjpeg libpng bzip2; + gtkLibs = gtkLibs210; # !!! correct? + inherit (xlibs) libXmu; + }); + + kdelibs = import ../desktops/kde/kdelibs { + inherit + fetchurl stdenv zlib perl openssl pcre pkgconfig + libjpeg libpng libtiff libxml2 libxslt libtool + expat freetype bzip2; + inherit (xlibs) libX11 libXt libXext; + qt = qt3; + }; + + ### MISC