Hello, this patch adds zenity to gnome desktop nix expressions and policyKit under os-specific/linux. This makes it possible to build metacity and gconf-editor successfully.
best regards, Christoph Herbst.
Index: pkgs/desktops/gnome/default.nix
===================================================================
--- pkgs/desktops/gnome/default.nix (revision 15623)
+++ pkgs/desktops/gnome/default.nix (working copy)
@@ -281,7 +281,7 @@
startupnotification = import ./startup-notification.nix {
inherit stdenv fetchurl pkgconfig x11;
- # Strangely, startup-notificatio has disappeared from Gnome
+ # Strangely, startup-notification has disappeared from Gnome
# releases, but it's still used.
input = {
name = "startup-notification-0.8";
@@ -294,13 +294,25 @@
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 @@
buildInputs = [
pkgconfig perl perlXMLParser GConf gnomedocutils
gtk libgnome libgnomeui gettext libxslt intltool
+ policyKit dbus_glib
];
configureFlags = "--disable-scrollkeeper";
Index: pkgs/desktops/gnome/metacity.nix
===================================================================
--- pkgs/desktops/gnome/metacity.nix (revision 15623)
+++ pkgs/desktops/gnome/metacity.nix (working copy)
@@ -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 @@
buildInputs = [
pkgconfig perl perlXMLParser glib gtk GConf startupnotification
libXinerama libXrandr libXcursor gettext intltool
+ zenity gnomedocutils
]
++ stdenv.lib.optionals enableCompositor [libXcomposite libXfixes libXdamage libcm];
Index: pkgs/os-specific/linux/polkit/default.nix
===================================================================
--- pkgs/os-specific/linux/polkit/default.nix (revision 0)
+++ pkgs/os-specific/linux/polkit/default.nix (revision 0)
@@ -0,0 +1,16 @@
+args: with args;
+
+assert stdenv ? glibc;
+
+stdenv.mkDerivation rec {
+ name = "PolicyKit-0.9";
+
+ src = fetchurl {
+ url = "http://hal.freedesktop.org/releases/${name}.tar.gz";;
+ sha256 = "f40c7c6bec19d7dba2335bddcffd0457494409a0dfce11d888c748dc892e80b7";
+ };
+
+ buildInputs = [
+ pkgconfig expat intltool glib dbus dbus_glib pam gettext
+ ];
+}
Index: pkgs/top-level/all-packages.nix
===================================================================
--- pkgs/top-level/all-packages.nix (revision 15623)
+++ pkgs/top-level/all-packages.nix (working copy)
@@ -5268,6 +5268,12 @@
inherit lib;
};
+ policyKit = import ../os-specific/linux/polkit {
+ inherit fetchurl stdenv pkgconfig intltool expat dbus dbus_glib pam;
+ inherit gettext;
+ inherit (gtkLibs) glib;
+ };
+
powertop = import ../os-specific/linux/powertop {
inherit fetchurl stdenv ncurses gettext;
};
@@ -7353,7 +7359,7 @@
gettext x11 libtiff libjpeg libpng gtkLibs xlibs bzip2
libcm python dbus dbus_glib ncurses which libxml2Python
iconnamingutils openssl hal samba fam libgcrypt libtasn1
- xmlto docbook2x docbook_xsl intltool enchant isocodes;
+ xmlto docbook2x docbook_xsl intltool enchant isocodes policyKit;
});
kde3 = {
smime.p7s
Description: S/MIME cryptographic signature
_______________________________________________ nix-dev mailing list nix-dev@cs.uu.nl https://mail.cs.uu.nl/mailman/listinfo/nix-dev
