From 775e0f0c18fb2bcfc297c92184c54e81fb2db79d Mon Sep 17 00:00:00 2001 From: Chris Marusich Date: Wed, 14 Dec 2016 00:44:54 -0800 Subject: [PATCH 1/2] gnome: Enable session tracking in network-manager. * 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. --- 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 1762381cf..846317f1d 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 Guix, this is provided via elogind. + "--with-consolekit=no" ; We haven't packaged consolekit yet. + "--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 -- 2.11.0