diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2009-06-19 06:45:25 +0000 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2009-06-19 06:45:25 +0000 |
| commit | 9765da15e0705e0f36e652b1df21c2215fe8c511 (patch) | |
| tree | ab0796a8813fac159b348f124841beb61f7ea5e5 /pkgs/desktops | |
| parent | 5eb66bcf9044e41f3ac57f4406ba42fbca8499b5 (diff) | |
| download | nixlib-9765da15e0705e0f36e652b1df21c2215fe8c511.tar nixlib-9765da15e0705e0f36e652b1df21c2215fe8c511.tar.gz nixlib-9765da15e0705e0f36e652b1df21c2215fe8c511.tar.bz2 nixlib-9765da15e0705e0f36e652b1df21c2215fe8c511.tar.lz nixlib-9765da15e0705e0f36e652b1df21c2215fe8c511.tar.xz nixlib-9765da15e0705e0f36e652b1df21c2215fe8c511.tar.zst nixlib-9765da15e0705e0f36e652b1df21c2215fe8c511.zip | |
Propagate zenity fix to gnome-2.26
svn path=/nixpkgs/trunk/; revision=16004
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/gnome-2.26/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/desktops/gnome-2.26/desktop/zenity/default.nix | 7 |
2 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/desktops/gnome-2.26/default.nix b/pkgs/desktops/gnome-2.26/default.nix index 65ca94b62a74..49a113e5b649 100644 --- a/pkgs/desktops/gnome-2.26/default.nix +++ b/pkgs/desktops/gnome-2.26/default.nix @@ -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 { diff --git a/pkgs/desktops/gnome-2.26/desktop/zenity/default.nix b/pkgs/desktops/gnome-2.26/desktop/zenity/default.nix index de1b91b0d22f..0bba8870e396 100644 --- a/pkgs/desktops/gnome-2.26/desktop/zenity/default.nix +++ b/pkgs/desktops/gnome-2.26/desktop/zenity/default.nix @@ -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"; } |