diff options
| -rw-r--r-- | pkgs/development/libraries/consolekit/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/hal/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
3 files changed, 10 insertions, 9 deletions
diff --git a/pkgs/development/libraries/consolekit/default.nix b/pkgs/development/libraries/consolekit/default.nix index 99d2fddda4116..f932785312666 100644 --- a/pkgs/development/libraries/consolekit/default.nix +++ b/pkgs/development/libraries/consolekit/default.nix @@ -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"; 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]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6f448f5fef24e..ffb6c62f1736f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; }; |