* PolicyKit -> policy-kit (suggested by Ludovic).
* Oops, there already was a polkit package. Mea culpa... svn path=/nixpkgs/trunk/; revision=16721
This commit is contained in:
parent
0e14f884d3
commit
9ea1a49aa2
|
@ -328,7 +328,7 @@ rec {
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
pkgconfig perl perlXMLParser GConf gnomedocutils
|
pkgconfig perl perlXMLParser GConf gnomedocutils
|
||||||
gtk libgnome libgnomeui gettext libxslt intltool
|
gtk libgnome libgnomeui gettext libxslt intltool
|
||||||
policyKit dbus_glib
|
policy_kit dbus_glib
|
||||||
];
|
];
|
||||||
|
|
||||||
configureFlags = "--disable-scrollkeeper";
|
configureFlags = "--disable-scrollkeeper";
|
||||||
|
|
|
@ -1,9 +1,7 @@
|
||||||
{ stdenv, fetchurl, pkgconfig, glib, eggdbus, expat, pam, intltool, gettext }:
|
{ stdenv, fetchurl, pkgconfig, glib, eggdbus, expat, pam, intltool, gettext }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
# ... or should we name this package "polkit"? Upstream doesn't
|
name = "policy-kit-0.92";
|
||||||
# seem to know either...
|
|
||||||
name = "PolicyKit-0.92";
|
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = http://hal.freedesktop.org/releases/polkit-0.92.tar.gz;
|
url = http://hal.freedesktop.org/releases/polkit-0.92.tar.gz;
|
|
@ -1,16 +0,0 @@
|
||||||
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
|
|
||||||
];
|
|
||||||
}
|
|
|
@ -3902,7 +3902,7 @@ let
|
||||||
inherit (xlibs) libXi libSM libXmu libXext libX11;
|
inherit (xlibs) libXi libSM libXmu libXext libX11;
|
||||||
};
|
};
|
||||||
|
|
||||||
PolicyKit = import ../development/libraries/PolicyKit {
|
policy_kit = import ../development/libraries/policy-kit {
|
||||||
inherit stdenv fetchurl pkgconfig eggdbus expat pam intltool gettext;
|
inherit stdenv fetchurl pkgconfig eggdbus expat pam intltool gettext;
|
||||||
inherit (gtkLibs) glib;
|
inherit (gtkLibs) glib;
|
||||||
};
|
};
|
||||||
|
@ -5442,12 +5442,6 @@ let
|
||||||
inherit lib;
|
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 {
|
powertop = import ../os-specific/linux/powertop {
|
||||||
inherit fetchurl stdenv ncurses gettext;
|
inherit fetchurl stdenv ncurses gettext;
|
||||||
};
|
};
|
||||||
|
@ -7616,7 +7610,7 @@ let
|
||||||
gettext x11 libtiff libjpeg libpng gtkLibs xlibs bzip2
|
gettext x11 libtiff libjpeg libpng gtkLibs xlibs bzip2
|
||||||
libcm python dbus dbus_glib ncurses which libxml2Python
|
libcm python dbus dbus_glib ncurses which libxml2Python
|
||||||
iconnamingutils openssl hal samba fam libgcrypt libtasn1
|
iconnamingutils openssl hal samba fam libgcrypt libtasn1
|
||||||
xmlto docbook2x docbook_xsl intltool enchant isocodes policyKit
|
xmlto docbook2x docbook_xsl intltool enchant isocodes policy_kit
|
||||||
libproxy sqlite;
|
libproxy sqlite;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue