* Compiz: build GTK window decorators.
* Make GTK+ 2.10 the default. svn path=/nixpkgs/trunk/; revision=8072
This commit is contained in:
parent
d3bdca7623
commit
3db007461c
|
@ -1,6 +1,6 @@
|
||||||
{ stdenv, fetchurl, pkgconfig, libpng, libXcomposite, libXfixes
|
{ stdenv, fetchurl, pkgconfig, libpng, libXcomposite, libXfixes
|
||||||
, libXdamage, libXrandr, libXinerama, libICE, libSM
|
, libXdamage, libXrandr, libXinerama, libICE, libSM
|
||||||
, startupnotification, libXrender, xextproto, mesa, gtk
|
, startupnotification, libXrender, xextproto, mesa, gtk, libwnck
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
|
@ -16,7 +16,7 @@ stdenv.mkDerivation {
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
pkgconfig libpng libXcomposite libXfixes libXdamage libXrandr
|
pkgconfig libpng libXcomposite libXfixes libXdamage libXrandr
|
||||||
libXinerama libICE libSM startupnotification libXrender xextproto
|
libXinerama libICE libSM startupnotification libXrender xextproto
|
||||||
mesa gtk
|
mesa gtk libwnck
|
||||||
];
|
];
|
||||||
configureFlags = "--disable-gconf";
|
configureFlags = "--disable-gconf --enable-gtk";
|
||||||
}
|
}
|
||||||
|
|
|
@ -165,7 +165,7 @@ rec {
|
||||||
};
|
};
|
||||||
|
|
||||||
libwnck = (import ./libwnck) {
|
libwnck = (import ./libwnck) {
|
||||||
inherit fetchurl stdenv pkgconfig gtk;
|
inherit fetchurl stdenv pkgconfig gtk perl perlXMLParser gettext;
|
||||||
input = desktop.libwnck;
|
input = desktop.libwnck;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{input, stdenv, fetchurl, pkgconfig, gtk}:
|
{input, stdenv, fetchurl, pkgconfig, gtk, perl, perlXMLParser, gettext}:
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
inherit (input) name src;
|
inherit (input) name src;
|
||||||
buildInputs = [pkgconfig gtk];
|
buildInputs = [pkgconfig gtk perl perlXMLParser gettext];
|
||||||
}
|
}
|
||||||
|
|
|
@ -1239,7 +1239,8 @@ rec {
|
||||||
};
|
};
|
||||||
|
|
||||||
cairo = import ../development/libraries/cairo {
|
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 {
|
chmlib = import ../development/libraries/chmlib {
|
||||||
|
@ -1339,7 +1340,7 @@ rec {
|
||||||
flex bison popt zlib libxml2 libxslt
|
flex bison popt zlib libxml2 libxslt
|
||||||
perl perlXMLParser docbook_xml_dtd_42 gettext x11
|
perl perlXMLParser docbook_xml_dtd_42 gettext x11
|
||||||
libtiff libjpeg libpng bzip2;
|
libtiff libjpeg libpng bzip2;
|
||||||
gtkLibs = gtkLibs28;
|
gtkLibs = gtkLibs210; # !!! correct?
|
||||||
inherit (xlibs) libXmu;
|
inherit (xlibs) libXmu;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -1347,7 +1348,7 @@ rec {
|
||||||
inherit fetchurl stdenv libgpgerror gnupg;
|
inherit fetchurl stdenv libgpgerror gnupg;
|
||||||
};
|
};
|
||||||
|
|
||||||
gtkLibs = recurseIntoAttrs gtkLibs28 /* !!! -> gtkLibs10 */;
|
gtkLibs = recurseIntoAttrs gtkLibs210;
|
||||||
|
|
||||||
gtkLibs1x = import ../development/libraries/gtk-libs-1.x {
|
gtkLibs1x = import ../development/libraries/gtk-libs-1.x {
|
||||||
inherit fetchurl stdenv x11 libtiff libjpeg libpng;
|
inherit fetchurl stdenv x11 libtiff libjpeg libpng;
|
||||||
|
@ -2541,7 +2542,7 @@ rec {
|
||||||
inherit fetchurl stdenv pkgconfig libpng mesa;
|
inherit fetchurl stdenv pkgconfig libpng mesa;
|
||||||
inherit (xorg) libXcomposite libXfixes libXdamage libXrandr
|
inherit (xorg) libXcomposite libXfixes libXdamage libXrandr
|
||||||
libXinerama libICE libSM libXrender xextproto;
|
libXinerama libICE libSM libXrender xextproto;
|
||||||
inherit (gnome) startupnotification;
|
inherit (gnome) startupnotification libwnck;
|
||||||
inherit (gtkLibs) gtk;
|
inherit (gtkLibs) gtk;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue