diff options
| author | Marc Weber <marco-oweber@gmx.de> | 2009-05-20 17:39:18 +0000 |
|---|---|---|
| committer | Marc Weber <marco-oweber@gmx.de> | 2009-05-20 17:39:18 +0000 |
| commit | 88eb04c0dce0f6be8fff4a777cc00a79e2aec87b (patch) | |
| tree | cb965e2049e6f1339cfe0415c45a5bfa517d4ed4 /pkgs/desktops | |
| parent | c7c225d5fe1b090a4a24d78cff982e600b17b622 (diff) | |
| download | nixlib-88eb04c0dce0f6be8fff4a777cc00a79e2aec87b.tar nixlib-88eb04c0dce0f6be8fff4a777cc00a79e2aec87b.tar.gz nixlib-88eb04c0dce0f6be8fff4a777cc00a79e2aec87b.tar.bz2 nixlib-88eb04c0dce0f6be8fff4a777cc00a79e2aec87b.tar.lz nixlib-88eb04c0dce0f6be8fff4a777cc00a79e2aec87b.tar.xz nixlib-88eb04c0dce0f6be8fff4a777cc00a79e2aec87b.tar.zst nixlib-88eb04c0dce0f6be8fff4a777cc00a79e2aec87b.zip | |
adding zenity to gnome desktop nix expressions
making it possible to build metacity and gconf-editor patch provided by Christoph Herbst svn path=/nixpkgs/trunk/; revision=15681
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/gnome/default.nix | 15 | ||||
| -rw-r--r-- | pkgs/desktops/gnome/metacity.nix | 3 |
2 files changed, 16 insertions, 2 deletions
diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index 7d0d056c971f..ae0e0b743bf7 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -294,13 +294,25 @@ rec { metacity = import ./metacity.nix { inherit stdenv fetchurl pkgconfig perl perlXMLParser glib gtk - GConf startupnotification gettext libcm intltool; + GConf startupnotification gettext libcm intltool zenity gnomedocutils; inherit (xlibs) libXinerama libXrandr libXcursor libXcomposite libXfixes libXdamage; enableCompositor = true; input = desktop.metacity; }; + zenity = stdenv.mkDerivation { + inherit (desktop.zenity) name src; + + buildInputs = [ + pkgconfig glib gtk + gettext intltool gnomedocutils libglade + libxslt + ]; + + configureFlags = "--disable-scrollkeeper"; + }; + gnomedocutils = import ./gnome-doc-utils.nix { inherit stdenv fetchurl pkgconfig perl perlXMLParser python libxml2 libxslt gettext libxml2Python; @@ -313,6 +325,7 @@ rec { buildInputs = [ pkgconfig perl perlXMLParser GConf gnomedocutils gtk libgnome libgnomeui gettext libxslt intltool + policyKit dbus_glib ]; configureFlags = "--disable-scrollkeeper"; diff --git a/pkgs/desktops/gnome/metacity.nix b/pkgs/desktops/gnome/metacity.nix index 184efc2a165e..9d22add6af8c 100644 --- a/pkgs/desktops/gnome/metacity.nix +++ b/pkgs/desktops/gnome/metacity.nix @@ -1,6 +1,6 @@ { input, stdenv, fetchurl, pkgconfig, perl, perlXMLParser, glib, gtk , GConf, startupnotification, libXinerama, libXrandr, libXcursor -, gettext, intltool +, gettext, intltool, zenity, gnomedocutils , enableCompositor ? false , libXcomposite ? null, libXfixes ? null, libXdamage ? null, libcm ? null @@ -15,6 +15,7 @@ stdenv.mkDerivation { buildInputs = [ pkgconfig perl perlXMLParser glib gtk GConf startupnotification libXinerama libXrandr libXcursor gettext intltool + zenity gnomedocutils ] ++ stdenv.lib.optionals enableCompositor [libXcomposite libXfixes libXdamage libcm]; |