forked from mirrors/nixpkgs
* Build HAL with ConsoleKit and PolicyKit support. Without it, HAL's
configure script prints out this ominous warning: WARNING: PolicyKit is disabled. You need to manually edit the hal.conf file to lock down the service. Failure to do so allows any caller to make hald do work on their behalf which may be a huge SECURITY HOLE. I repeat: YOU NEED TO EDIT THE FILE hal.conf to match your distro/site to avoid NASTY SECURITY HOLES. Note that HAL only builds with the old PolicyKit (it looks for polkit.pc). Reverted ConsoleKit to the last version that used the old PolicyKit for this reason. svn path=/nixpkgs/trunk/; revision=17432
This commit is contained in:
parent
ef2f9c1968
commit
a96c83d70e
|
@ -1,14 +1,14 @@
|
|||
{ stdenv, fetchurl, pkgconfig, dbus_glib, zlib, pam, glib, libX11, polkit }:
|
||||
{ stdenv, fetchurl, pkgconfig, dbus_glib, zlib, pam, glib, libX11, policykit, expat }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "consolekit-0.3.1";
|
||||
name = "consolekit-0.2.10";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://www.freedesktop.org/software/ConsoleKit/dist/ConsoleKit-0.3.1.tar.bz2;
|
||||
sha256 = "0b834ly6l8l76awr2pn2xz3ic6ilhfif4h3nsi96ffa91n09ydk0";
|
||||
url = http://www.freedesktop.org/software/ConsoleKit/dist/ConsoleKit-0.2.10.tar.gz;
|
||||
sha256 = "1jrv33shrmc1klwpgp02pycmbk9lfaxkd5q7bqxb6v95cl7m3f82";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgconfig dbus_glib zlib pam glib libX11 polkit ];
|
||||
buildInputs = [ pkgconfig dbus_glib zlib pam glib libX11 policykit expat ];
|
||||
|
||||
configureFlags = "--enable-pam-module --with-pam-module-dir=$(out)/lib/security --localstatedir=/var --sysconfdir=/etc";
|
||||
|
||||
|
|
|
@ -4,7 +4,7 @@ assert stdenv ? glibc;
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "hal-0.5.13";
|
||||
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://hal.freedesktop.org/releases/${name}.tar.gz";
|
||||
sha256 = "1by8z7vy1c1m3iyh57rlqx6rah5gj6kx3ba30s9305bnffij5kzb";
|
||||
|
@ -13,6 +13,7 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = [
|
||||
pkgconfig python pciutils expat libusb dbus.libs dbus_glib glib
|
||||
libuuid perl perlXMLParser gettext zlib gperf
|
||||
consolekit policykit
|
||||
# !!! libsmbios is broken; it doesn't install headers.
|
||||
];
|
||||
|
||||
|
@ -24,7 +25,6 @@ stdenv.mkDerivation rec {
|
|||
--localstatedir=/var
|
||||
--with-eject=${eject}/bin/eject
|
||||
--with-linux-input-header=${stdenv.glibc}/include/linux/input.h
|
||||
--disable-policy-kit
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [libusb libsmbios];
|
||||
|
|
|
@ -3011,7 +3011,7 @@ let
|
|||
};
|
||||
|
||||
consolekit = import ../development/libraries/consolekit {
|
||||
inherit stdenv fetchurl pkgconfig dbus_glib zlib pam polkit;
|
||||
inherit stdenv fetchurl pkgconfig dbus_glib zlib pam policykit expat;
|
||||
inherit (gtkLibs) glib;
|
||||
inherit (xlibs) libX11;
|
||||
};
|
||||
|
@ -5041,7 +5041,8 @@ let
|
|||
hal = import ../os-specific/linux/hal {
|
||||
inherit fetchurl stdenv pkgconfig python pciutils usbutils expat
|
||||
libusb dbus dbus_glib libuuid perl perlXMLParser
|
||||
gettext zlib eject libsmbios udev gperf dmidecode utillinuxng;
|
||||
gettext zlib eject libsmbios udev gperf dmidecode utillinuxng
|
||||
consolekit policykit;
|
||||
inherit (gtkLibs) glib;
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in a new issue