mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-20 20:20:26 +03:00
Propagate zenity fix to gnome-2.26
svn path=/nixpkgs/trunk/; revision=16004
This commit is contained in:
parent
5eb66bcf90
commit
9765da15e0
@ -180,6 +180,7 @@ rec {
|
|||||||
inherit (pkgs) stdenv fetchurl pkgconfig cairo libxml2 libxslt;
|
inherit (pkgs) stdenv fetchurl pkgconfig cairo libxml2 libxslt;
|
||||||
inherit (pkgs.gtkLibs) glib gtk pango atk;
|
inherit (pkgs.gtkLibs) glib gtk pango atk;
|
||||||
inherit gnome_doc_utils intltool libglade;
|
inherit gnome_doc_utils intltool libglade;
|
||||||
|
inherit (pkgs.xlibs) libX11;
|
||||||
};
|
};
|
||||||
|
|
||||||
metacity = import ./desktop/metacity {
|
metacity = import ./desktop/metacity {
|
||||||
|
@ -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 {
|
stdenv.mkDerivation {
|
||||||
name = "zenity-2.26.0";
|
name = "zenity-2.26.0";
|
||||||
@ -7,9 +8,9 @@ stdenv.mkDerivation {
|
|||||||
sha256 = "1882sh83jp3drg5z61rghdshnsfys4jgbgg7za7b9jlhr8ar4qgw";
|
sha256 = "1882sh83jp3drg5z61rghdshnsfys4jgbgg7za7b9jlhr8ar4qgw";
|
||||||
};
|
};
|
||||||
configureFlags = "--disable-scrollkeeper";
|
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 "+
|
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${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";
|
"-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";
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user