consolekit: Remove
This package is obsolete with systemd.
This commit is contained in:
Eelco Dolstra
parent
8beea55869
commit
8116fd9341
@ -1,5 +1,5 @@
|
||||
{ stdenv, fetchurl, cmake, pkgconfig, x11, libjpeg, libpng12, libXmu
|
||||
, fontconfig, freetype, pam, consolekit, dbus_libs }:
|
||||
, fontconfig, freetype, pam, dbus_libs }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "slim-1.3.4";
|
||||
@ -18,11 +18,11 @@ stdenv.mkDerivation rec {
|
||||
buildInputs =
|
||||
[ cmake pkgconfig x11 libjpeg libpng12 libXmu fontconfig freetype
|
||||
pam dbus_libs
|
||||
] ++ stdenv.lib.optional (consolekit != null) consolekit;
|
||||
];
|
||||
|
||||
preConfigure = "substituteInPlace CMakeLists.txt --replace /etc $out/etc";
|
||||
|
||||
cmakeFlags = [ "-DUSE_PAM=1" ] ++ stdenv.lib.optional (consolekit != null) "-DUSE_CONSOLEKIT=1";
|
||||
cmakeFlags = [ "-DUSE_PAM=1" ];
|
||||
|
||||
NIX_CFLAGS_LINK = "-lXmu";
|
||||
|
||||
|
||||
@ -1,28 +0,0 @@
|
||||
Upstream patch
|
||||
|
||||
From fc2870a65f6b3ed3b71bcac69c5faf3a9c759c64 Mon Sep 17 00:00:00 2001
|
||||
From: Matthias Clasen <mclasen@redhat.com>
|
||||
Date: Mon, 21 Dec 2009 11:13:23 -0500
|
||||
Subject: [PATCH 1/2] Don't daemonize when activated
|
||||
|
||||
It confuses some versions of D-Bus and isn't needed
|
||||
(or wanted it).
|
||||
|
||||
http://bugs.freedesktop.org/show_bug.cgi?id=25642
|
||||
---
|
||||
data/org.freedesktop.ConsoleKit.service.in | 2 +-
|
||||
1 files changed, 1 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/data/org.freedesktop.ConsoleKit.service.in b/data/org.freedesktop.ConsoleKit.service.in
|
||||
index ec2128c..d716a36 100644
|
||||
--- a/data/org.freedesktop.ConsoleKit.service.in
|
||||
+++ b/data/org.freedesktop.ConsoleKit.service.in
|
||||
@@ -1,4 +1,4 @@
|
||||
[D-BUS Service]
|
||||
Name=org.freedesktop.ConsoleKit
|
||||
-Exec=@sbindir@/console-kit-daemon
|
||||
+Exec=@sbindir@/console-kit-daemon --no-daemon
|
||||
User=root
|
||||
--
|
||||
1.7.1
|
||||
|
||||
@ -1,62 +0,0 @@
|
||||
Upstream patch
|
||||
|
||||
From 2418840248f07025ad0edc96ed17e03ce5e47f3e Mon Sep 17 00:00:00 2001
|
||||
From: Ray Strode <rstrode@redhat.com>
|
||||
Date: Mon, 21 Dec 2009 11:14:54 -0500
|
||||
Subject: [PATCH 2/2] Don't take bus name until ready
|
||||
|
||||
Previously, we would take a bus name right away, but
|
||||
not register the manager object until later. This
|
||||
causes a race when being activated by a method call
|
||||
on the manager object, where ConsoleKit gets started
|
||||
but the method call fails.
|
||||
|
||||
https://bugs.freedesktop.org/show_bug.cgi?id=25744
|
||||
---
|
||||
src/main.c | 16 ++++++++--------
|
||||
1 files changed, 8 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/src/main.c b/src/main.c
|
||||
index 809c6d6..b8f698f 100644
|
||||
--- a/src/main.c
|
||||
+++ b/src/main.c
|
||||
@@ -294,11 +294,19 @@ main (int argc,
|
||||
|
||||
setup_debug_log (debug);
|
||||
|
||||
+ g_debug ("initializing console-kit-daemon %s", VERSION);
|
||||
+
|
||||
connection = get_system_bus ();
|
||||
if (connection == NULL) {
|
||||
goto out;
|
||||
}
|
||||
|
||||
+ manager = ck_manager_new ();
|
||||
+
|
||||
+ if (manager == NULL) {
|
||||
+ goto out;
|
||||
+ }
|
||||
+
|
||||
bus_proxy = get_bus_proxy (connection);
|
||||
if (bus_proxy == NULL) {
|
||||
g_warning ("Could not construct bus_proxy object; bailing out");
|
||||
@@ -310,16 +318,8 @@ main (int argc,
|
||||
goto out;
|
||||
}
|
||||
|
||||
- g_debug ("initializing console-kit-daemon %s", VERSION);
|
||||
-
|
||||
create_pid_file ();
|
||||
|
||||
- manager = ck_manager_new ();
|
||||
-
|
||||
- if (manager == NULL) {
|
||||
- goto out;
|
||||
- }
|
||||
-
|
||||
loop = g_main_loop_new (NULL, FALSE);
|
||||
|
||||
g_signal_connect (bus_proxy,
|
||||
--
|
||||
1.7.1
|
||||
|
||||
@ -1,33 +0,0 @@
|
||||
This patch adds shutdown commands specific to NixOS, as NixOS does not have
|
||||
a /sbin or /usr/sbin directory. In order not to have a dependency on the
|
||||
package that provides "shutdown" when in an environment other than NixOS,
|
||||
we'll make it depend on /var/run/current-system.
|
||||
|
||||
Note: this patch does not compromise system security. Other systems than
|
||||
NixOS should have already shutdown in the earlier directories being searched,
|
||||
and otherwise /var/run is writable only be root.
|
||||
|
||||
--- ConsoleKit-0.4.1/tools/linux/ck-system-restart.org 2012-02-13 11:29:57.352902568 +0100
|
||||
+++ ConsoleKit-0.4.1/tools/linux/ck-system-restart 2012-02-13 11:43:27.593317712 +0100
|
||||
@@ -7,6 +7,9 @@
|
||||
elif [ -x "/usr/sbin/shutdown" ] ; then
|
||||
/usr/sbin/shutdown -r now
|
||||
exit $?
|
||||
+elif [ -x "/var/run/current-system/sw/sbin/shutdown" ] ; then
|
||||
+ /var/run/current-system/sw/sbin/shutdown -r now
|
||||
+ exit $?
|
||||
else
|
||||
exit 1
|
||||
fi
|
||||
--- ConsoleKit-0.4.1/tools/linux/ck-system-stop.org 2012-02-13 11:30:06.228950934 +0100
|
||||
+++ ConsoleKit-0.4.1/tools/linux/ck-system-stop 2012-02-13 11:44:12.664563304 +0100
|
||||
@@ -7,6 +7,9 @@
|
||||
elif [ -x "/usr/sbin/shutdown" ] ; then
|
||||
/usr/sbin/shutdown -h now
|
||||
exit $?
|
||||
+elif [ -x "/var/run/current-system/sw/sbin/shutdown" ] ; then
|
||||
+ /var/run/current-system/sw/sbin/shutdown -h now
|
||||
+ exit $?
|
||||
else
|
||||
exit 1
|
||||
fi
|
||||
@ -1,29 +0,0 @@
|
||||
{ stdenv, fetchurl, pkgconfig, dbus_glib, zlib, pam, glib,
|
||||
libX11, polkit, expat }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "consolekit-0.4.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://www.freedesktop.org/software/ConsoleKit/dist/ConsoleKit-0.4.1.tar.bz2;
|
||||
sha256 = "0gj0airrgyi14a06w3d4407g62bs5a1cam2h64s50x3d2k3ascph";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgconfig dbus_glib zlib pam glib libX11 polkit expat ];
|
||||
patches = [ ./0001-Don-t-daemonize-when-activated.patch
|
||||
./0002-Don-t-take-bus-name-until-ready.patch
|
||||
./commands.patch # adds shutdown commands for NixOS to the list of shutdown commands
|
||||
];
|
||||
|
||||
# For console-kit to get the rpath to libgcc_s, needed for pthread_cancel to work
|
||||
NIX_LDFLAGS = "-lgcc_s";
|
||||
|
||||
configureFlags = "--enable-pam-module --with-pam-module-dir=$(out)/lib/security --localstatedir=/var --sysconfdir=/etc";
|
||||
|
||||
installFlags = "sysconfdir=$(out)/etc DBUS_SYS_DIR=$(out)/etc/dbus-1/system.d"; # keep `make install' happy
|
||||
|
||||
meta = {
|
||||
homepage = http://www.freedesktop.org/wiki/Software/ConsoleKit;
|
||||
description = "A framework for defining and tracking users, login sessions, and seats";
|
||||
};
|
||||
}
|
||||
@ -3449,8 +3449,6 @@ let
|
||||
|
||||
confuse = callPackage ../development/libraries/confuse { };
|
||||
|
||||
consolekit = callPackage ../development/libraries/consolekit { };
|
||||
|
||||
coredumper = callPackage ../development/libraries/coredumper { };
|
||||
|
||||
ctl = callPackage ../development/libraries/ctl { };
|
||||
@ -7703,9 +7701,7 @@ let
|
||||
|
||||
dropbox = callPackage ../applications/networking/dropbox { };
|
||||
|
||||
slim = callPackage ../applications/display-managers/slim {
|
||||
consolekit = null;
|
||||
};
|
||||
slim = callPackage ../applications/display-managers/slim { };
|
||||
|
||||
sndBase = builderDefsPackage (import ../applications/audio/snd) {
|
||||
inherit fetchurl stdenv stringsWithDeps lib fftw;
|
||||
|
||||
@ -49,7 +49,6 @@ with (import ./release-lib.nix);
|
||||
chatzilla = linux;
|
||||
cksfv = all;
|
||||
classpath = linux;
|
||||
consolekit = linux;
|
||||
coreutils = all;
|
||||
cpio = all;
|
||||
cron = linux;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user