summary refs log tree commit diff
path: root/pkgs/os-specific
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2009-09-25 23:05:53 +0000
committerEelco Dolstra <eelco.dolstra@logicblox.com>2009-09-25 23:05:53 +0000
commita96c83d70ec4576cfd479f45568affe7671188d1 (patch)
tree49ce58cbabe1ef278079488bf768e2a7c607a265 /pkgs/os-specific
parentef2f9c1968a3eab30acd0bf4709c238f09ea7021 (diff)
* 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
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r--pkgs/os-specific/linux/hal/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/hal/default.nix b/pkgs/os-specific/linux/hal/default.nix
index 7c538dfca5b37..f62d4cd1eb3de 100644
--- a/pkgs/os-specific/linux/hal/default.nix
+++ b/pkgs/os-specific/linux/hal/default.nix
@@ -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];