git.iko.soy/typeable/nixpkgs
on master help sign in
* Recurse into xorg, gnome, gtkLibs (i.e., they show up in nix-env

operations). svn path=/nixpkgs/branches/usability/; revision=5085

commit211f29fe28426337eb05eb86ab52885cbc58ab0f authorEelco Dolstra <eelco.dolstra@logicblox.com> dateThu 23 Mar 2006, 16:47 (21 years ago) parentbaec8f5
1 file changed+9−5
pkgs/top-level/all-packages.nix+9−5
pkgs/top-level/all-packages.nix+9−5
@@ -40,6 +40,10 @@ rec {
4040 ### Helper functions.
4141 useFromStdenv = hasIt: it: alternative: if hasIt then it else alternative;
4242
43+ # Applying this to an attribute set will cause nix-env to look
44+ # inside the set for derivations.
45+ recurseIntoAttrs = attrs: attrs // {recurseForDerivations = true;};
46+
4347
4448 ### STANDARD ENVIRONMENT
4549
@@ -1036,7 +1040,7 @@ rec {
10361040 inherit fetchurl stdenv pkgconfig x11 fontconfig freetype zlib libpng;
10371041 };
10381042
1039− gtkLibs = gtkLibs28;
1043+ gtkLibs = recurseIntoAttrs gtkLibs28;
10401044
10411045 gtkLibs28 = import ../development/libraries/gtk-libs-2.8 {
10421046 inherit fetchurl stdenv pkgconfig gettext perl x11
@@ -1127,13 +1131,13 @@ rec {
11271131 inherit fetchurl stdenv;
11281132 };
11291133
1130− gnome = import ../development/libraries/gnome {
1134+ gnome = recurseIntoAttrs (import ../development/libraries/gnome {
11311135 inherit fetchurl stdenv pkgconfig audiofile
11321136 flex bison popt zlib libxml2 libxslt
11331137 perl perlXMLParser docbook_xml_dtd_42 gettext x11
11341138 libtiff libjpeg libpng gtkLibs;
11351139 inherit (xlibs) libXmu;
1136− };
1140+ });
11371141
11381142 wxGTK = wxGTK26;
11391143
@@ -1559,10 +1563,10 @@ rec {
15591563 inherit fetchurl stdenv apacheHttpd python;
15601564 };
15611565
1562− xorg = import ../servers/x11/xorg {
1566+ xorg = recurseIntoAttrs (import ../servers/x11/xorg {
15631567 inherit fetchurl stdenv pkgconfig freetype fontconfig
15641568 expat libdrm libpng zlib perl mesa;
1565− };
1569+ });
15661570
15671571 postgresql = (import ../servers/sql/postgresql) {
15681572 inherit fetchurl stdenv readline ncurses zlib;