diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2007-02-28 16:18:58 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2007-02-28 16:18:58 +0000 |
| commit | 398768bfb566c31b50576561878561467d3a6013 (patch) | |
| tree | b419deb9f107f732983c77fdd1e65df7ce705c36 /pkgs/top-level | |
| parent | 917b75e9158dcab501fc7f5fbf38d724b9fe2f88 (diff) | |
| download | nixlib-398768bfb566c31b50576561878561467d3a6013.tar nixlib-398768bfb566c31b50576561878561467d3a6013.tar.gz nixlib-398768bfb566c31b50576561878561467d3a6013.tar.bz2 nixlib-398768bfb566c31b50576561878561467d3a6013.tar.lz nixlib-398768bfb566c31b50576561878561467d3a6013.tar.xz nixlib-398768bfb566c31b50576561878561467d3a6013.tar.zst nixlib-398768bfb566c31b50576561878561467d3a6013.zip | |
* Refactoring: move KDE and Gnome out of development/libraries into
desktops. svn path=/nixpkgs/trunk/; revision=8105
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 42 |
1 files changed, 23 insertions, 19 deletions
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 |