diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2010-05-15 09:54:50 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2010-05-15 09:54:50 +0000 |
| commit | 9c7c6a9202c2b38681cbbdbe8dbcb38f3a680d42 (patch) | |
| tree | d906b0173ac5018474bcc6ffa2f8067b6e3a99f4 | |
| parent | 1c9a08d3eb0bdabf1b90d2312093bc92fd96b467 (diff) | |
| download | nixlib-9c7c6a9202c2b38681cbbdbe8dbcb38f3a680d42.tar nixlib-9c7c6a9202c2b38681cbbdbe8dbcb38f3a680d42.tar.gz nixlib-9c7c6a9202c2b38681cbbdbe8dbcb38f3a680d42.tar.bz2 nixlib-9c7c6a9202c2b38681cbbdbe8dbcb38f3a680d42.tar.lz nixlib-9c7c6a9202c2b38681cbbdbe8dbcb38f3a680d42.tar.xz nixlib-9c7c6a9202c2b38681cbbdbe8dbcb38f3a680d42.tar.zst nixlib-9c7c6a9202c2b38681cbbdbe8dbcb38f3a680d42.zip | |
consolekit-0.4.1
svn path=/nixpkgs/trunk/; revision=21783
| -rw-r--r-- | pkgs/development/libraries/consolekit/default.nix | 13 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 6 insertions, 9 deletions
diff --git a/pkgs/development/libraries/consolekit/default.nix b/pkgs/development/libraries/consolekit/default.nix index f41e8c6fbd1b..06b48b37580d 100644 --- a/pkgs/development/libraries/consolekit/default.nix +++ b/pkgs/development/libraries/consolekit/default.nix @@ -1,21 +1,18 @@ { stdenv, fetchurl, pkgconfig, dbus_glib, zlib, pam, glib, - libX11, policykit, expat, ... }: + libX11, polkit, expat }: stdenv.mkDerivation rec { - name = "consolekit-0.2.10"; + name = "consolekit-0.4.1"; src = fetchurl { - url = http://www.freedesktop.org/software/ConsoleKit/dist/ConsoleKit-0.2.10.tar.gz; - sha256 = "1jrv33shrmc1klwpgp02pycmbk9lfaxkd5q7bqxb6v95cl7m3f82"; + url = http://www.freedesktop.org/software/ConsoleKit/dist/ConsoleKit-0.4.1.tar.bz2; + sha256 = "0gj0airrgyi14a06w3d4407g62bs5a1cam2h64s50x3d2k3ascph"; }; - buildInputs = [ pkgconfig dbus_glib zlib pam glib libX11 policykit expat ]; + buildInputs = [ pkgconfig dbus_glib zlib pam glib libX11 polkit expat ]; configureFlags = "--enable-pam-module --with-pam-module-dir=$(out)/lib/security --localstatedir=/var --sysconfdir=/etc"; - # Needed for pthread_cancel(). - NIX_LDFLAGS = "-lgcc_s"; - installFlags = "sysconfdir=$(out)/etc DBUS_SYS_DIR=$(out)/etc/dbus-1/system.d"; # keep `make install' happy meta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a341ad56197e..b1bd8fbcb571 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3601,7 +3601,7 @@ let }; consolekit = makeOverridable (import ../development/libraries/consolekit) { - inherit stdenv fetchurl pkgconfig dbus_glib zlib pam policykit expat glib; + inherit stdenv fetchurl pkgconfig dbus_glib zlib pam polkit expat glib; inherit (xlibs) libX11; }; |