nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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>
This commit is contained in:
Chris Marusich 2016-12-14 00:44:54 -08:00 committed by Ludovic Courtès
parent 6976c68158
commit fd070f35d3
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
gnu/packages/gnome.scm
View File

@ -4399,7 +4399,19 @@ users.")
"NetworkManager-" version ".tar.xz")) "NetworkManager-" version ".tar.xz"))
(sha256 (sha256
(base32 (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) (build-system gnu-build-system)
(outputs '("out" (outputs '("out"
"doc")) ; 8 MiB of gtk-doc HTML "doc")) ; 8 MiB of gtk-doc HTML
@ -4409,7 +4421,9 @@ users.")
(doc (assoc-ref %outputs "doc")) (doc (assoc-ref %outputs "doc"))
(dhclient (string-append (assoc-ref %build-inputs "isc-dhcp") (dhclient (string-append (assoc-ref %build-inputs "isc-dhcp")
"/sbin/dhclient"))) "/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" "--disable-config-plugin-ibft"
"--sysconfdir=/etc" "--sysconfdir=/etc"
"--localstatedir=/var" "--localstatedir=/var"
@ -4474,7 +4488,8 @@ users.")
("polkit" ,polkit) ("polkit" ,polkit)
("ppp" ,ppp) ("ppp" ,ppp)
("readline" ,readline) ("readline" ,readline)
("util-linux" ,util-linux))) ("util-linux" ,util-linux)
("elogind" ,elogind)))
(synopsis "Network connection manager") (synopsis "Network connection manager")
(home-page "http://www.gnome.org/projects/NetworkManager/") (home-page "http://www.gnome.org/projects/NetworkManager/")
(description (description