[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/07: gnu: network-manager: Enable session tracking with elogind.
From: |
Ludovic Courtès |
Subject: |
01/07: gnu: network-manager: Enable session tracking with elogind. |
Date: |
Thu, 15 Dec 2016 16:12:02 +0000 (UTC) |
civodul pushed a commit to branch master
in repository guix.
commit fd070f35d3db24ecdfe68a18332339827bb7a259
Author: Chris Marusich <address@hidden>
Date: Wed Dec 14 00:44:54 2016 -0800
gnu: network-manager: Enable session tracking with elogind.
* gnu/packages/gnome.scm (network-manager): Add configuration options
"--with-systemd-logind=yes" (so we can use elogind to track login
sessions)
and "--with-consolekit=no" (so we don't use consolekit to track sessions,
since it isn't packaged yet). Add elogind as an input, and add a snippet
to
replace some references to systemd with elogind.
Signed-off-by: Ludovic Courtès <address@hidden>
---
gnu/packages/gnome.scm | 21 ++++++++++++++++++---
1 file changed, 18 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 1762381..0322d5f 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -4399,7 +4399,19 @@ users.")
"NetworkManager-" version ".tar.xz"))
(sha256
(base32
- "016jc21mwjxvnfiblp5lji55sr8aq6w8a08fsjmqvnpnvm3y6r58"))))
+ "016jc21mwjxvnfiblp5lji55sr8aq6w8a08fsjmqvnpnvm3y6r58"))
+ (snippet
+ '(begin
+ (use-modules (guix build utils))
+ (substitute* "configure"
+ ;; Replace libsystemd-login with libelogind.
+ (("libsystemd-login") "libelogind"))
+ (substitute* "src/devices/wwan/nm-modem-manager.c"
+ (("systemd") "elogind"))
+ (substitute* "src/nm-session-monitor.c"
+ (("systemd") "elogind"))
+ (substitute* "./src/nm-logging.c"
+ (("systemd") "elogind"))))))
(build-system gnu-build-system)
(outputs '("out"
"doc")) ; 8 MiB of gtk-doc HTML
@@ -4409,7 +4421,9 @@ users.")
(doc (assoc-ref %outputs "doc"))
(dhclient (string-append (assoc-ref %build-inputs "isc-dhcp")
"/sbin/dhclient")))
- (list "--with-crypto=gnutls"
+ (list "--with-systemd-logind=yes" ;In GuixSD, this is provided by
elogind.
+ "--with-consolekit=no"
+ "--with-crypto=gnutls"
"--disable-config-plugin-ibft"
"--sysconfdir=/etc"
"--localstatedir=/var"
@@ -4474,7 +4488,8 @@ users.")
("polkit" ,polkit)
("ppp" ,ppp)
("readline" ,readline)
- ("util-linux" ,util-linux)))
+ ("util-linux" ,util-linux)
+ ("elogind" ,elogind)))
(synopsis "Network connection manager")
(home-page "http://www.gnome.org/projects/NetworkManager/")
(description
- branch master updated (6976c68 -> 7781afd), Ludovic Courtès, 2016/12/15
- 03/07: services: postgresql: Add port to configuration, Ludovic Courtès, 2016/12/15
- 07/07: gnu: Add kdevelop., Ludovic Courtès, 2016/12/15
- 01/07: gnu: network-manager: Enable session tracking with elogind.,
Ludovic Courtès <=
- 05/07: gnu: libksysguard: Correct inputs., Ludovic Courtès, 2016/12/15
- 02/07: gnu: gnome-settings-daemon: Add dependency on NetworkManager., Ludovic Courtès, 2016/12/15
- 04/07: services: postgresql: Add locale to configuration, Ludovic Courtès, 2016/12/15
- 06/07: gnu: Add kdevplatform., Ludovic Courtès, 2016/12/15