diff options
| author | Chris Marusich <cmmarusich@gmail.com> | 2016-12-14 00:44:54 -0800 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2016-12-15 16:50:48 +0100 |
| commit | fd070f35d3db24ecdfe68a18332339827bb7a259 (patch) | |
| tree | db5a6f62030d4f80635fe7e2d4f22b12b12bae82 /gnu/packages/gnome.scm | |
| parent | 6976c68158e9c6bb264ca48041da5be1c24521cf (diff) | |
| download | gnu-guix-fd070f35d3db24ecdfe68a18332339827bb7a259.tar gnu-guix-fd070f35d3db24ecdfe68a18332339827bb7a259.tar.gz | |
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 <ludo@gnu.org>
Diffstat (limited to 'gnu/packages/gnome.scm')
| -rw-r--r-- | gnu/packages/gnome.scm | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 1762381cf0..0322d5f571 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 |