Propagate zenity fix to gnome-2.26

svn path=/nixpkgs/trunk/; revision=16004
This commit is contained in:
Michael Raskin 2009-06-19 06:45:25 +00:00
parent 5eb66bcf90
commit 9765da15e0
2 changed files with 5 additions and 3 deletions

View file

@ -180,6 +180,7 @@ rec {
inherit (pkgs) stdenv fetchurl pkgconfig cairo libxml2 libxslt;
inherit (pkgs.gtkLibs) glib gtk pango atk;
inherit gnome_doc_utils intltool libglade;
inherit (pkgs.xlibs) libX11;
};
metacity = import ./desktop/metacity {

View file

@ -1,4 +1,5 @@
{stdenv, fetchurl, pkgconfig, cairo, libxml2, libxslt, glib, gtk, pango, atk, gnome_doc_utils, intltool, libglade}:
{stdenv, fetchurl, pkgconfig, cairo, libxml2, libxslt, glib, gtk, pango, atk, gnome_doc_utils, intltool, libglade,
libX11}:
stdenv.mkDerivation {
name = "zenity-2.26.0";
@ -7,9 +8,9 @@ stdenv.mkDerivation {
sha256 = "1882sh83jp3drg5z61rghdshnsfys4jgbgg7za7b9jlhr8ar4qgw";
};
configureFlags = "--disable-scrollkeeper";
buildInputs = [ pkgconfig gtk gnome_doc_utils intltool libglade libxml2 libxslt ];
buildInputs = [ pkgconfig gtk gnome_doc_utils intltool libglade libxml2 libxslt libX11];
CPPFLAGS = "-I${cairo}/include/cairo -I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include "+
"-I${gtk}/include/gtk-2.0 -I${gtk}/lib/gtk-2.0/include -I${pango}/include/pango-1.0 "+
"-I${atk}/include/atk-1.0 -I${libglade}/include/libglade-2.0";
LIBS = "-lgtk-x11-2.0 -lglade-2.0";
LIBS = "-lgtk-x11-2.0 -lglade-2.0 -lX11";
}