diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2007-02-27 03:30:20 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2007-02-27 03:30:20 +0000 |
| commit | 3db007461cb36363aa9f0f615843114a67e11356 (patch) | |
| tree | b935b5c4dcbea95a4e59814abadce82d230cf30f /pkgs/top-level | |
| parent | d3bdca7623c9dba22782fb36e1e3f0f0793cda89 (diff) | |
| download | nixlib-3db007461cb36363aa9f0f615843114a67e11356.tar nixlib-3db007461cb36363aa9f0f615843114a67e11356.tar.gz nixlib-3db007461cb36363aa9f0f615843114a67e11356.tar.bz2 nixlib-3db007461cb36363aa9f0f615843114a67e11356.tar.lz nixlib-3db007461cb36363aa9f0f615843114a67e11356.tar.xz nixlib-3db007461cb36363aa9f0f615843114a67e11356.tar.zst nixlib-3db007461cb36363aa9f0f615843114a67e11356.zip | |
* Compiz: build GTK window decorators.
* Make GTK+ 2.10 the default. svn path=/nixpkgs/trunk/; revision=8072
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5706f15ad8b3..9242901b3a95 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1239,7 +1239,8 @@ rec { }; cairo = import ../development/libraries/cairo { - inherit fetchurl stdenv pkgconfig x11 fontconfig freetype zlib libpng; + inherit fetchurl stdenv x11 fontconfig freetype zlib libpng; + pkgconfig = pkgconfig_latest; }; chmlib = import ../development/libraries/chmlib { @@ -1339,7 +1340,7 @@ rec { flex bison popt zlib libxml2 libxslt perl perlXMLParser docbook_xml_dtd_42 gettext x11 libtiff libjpeg libpng bzip2; - gtkLibs = gtkLibs28; + gtkLibs = gtkLibs210; # !!! correct? inherit (xlibs) libXmu; }); @@ -1347,7 +1348,7 @@ rec { inherit fetchurl stdenv libgpgerror gnupg; }; - gtkLibs = recurseIntoAttrs gtkLibs28 /* !!! -> gtkLibs10 */; + gtkLibs = recurseIntoAttrs gtkLibs210; gtkLibs1x = import ../development/libraries/gtk-libs-1.x { inherit fetchurl stdenv x11 libtiff libjpeg libpng; @@ -2541,7 +2542,7 @@ rec { inherit fetchurl stdenv pkgconfig libpng mesa; inherit (xorg) libXcomposite libXfixes libXdamage libXrandr libXinerama libICE libSM libXrender xextproto; - inherit (gnome) startupnotification; + inherit (gnome) startupnotification libwnck; inherit (gtkLibs) gtk; }; |