diff options
author | Andy Wingo <wingo@pobox.com> | 2015-08-18 11:39:22 +0200 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2015-09-02 22:34:12 +0200 |
commit | 7b6c5c5d74fcb69b04929e7f5b2988adbeebcf2f (patch) | |
tree | d135f4ab66cd18a22dbc5f5ea74ff2b4a5dd0103 /gnu | |
parent | 04463bb05ebcead21114b45b7c7bac7c2e4d7e07 (diff) | |
download | gnu-guix-7b6c5c5d74fcb69b04929e7f5b2988adbeebcf2f.tar gnu-guix-7b6c5c5d74fcb69b04929e7f5b2988adbeebcf2f.tar.gz |
gnu: polkit: Use elogind for seat management.
* gnu/packages/polkit.scm (polkit): Depend on elogind.
Diffstat (limited to 'gnu')
-rw-r--r-- | gnu/packages/polkit.scm | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/gnu/packages/polkit.scm b/gnu/packages/polkit.scm index 172b0e128d..06afdf1330 100644 --- a/gnu/packages/polkit.scm +++ b/gnu/packages/polkit.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014 Andreas Enge <andreas@enge.fr> +;;; Copyright © 2015 Andy Wingo <wingo@igalia.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -23,6 +24,7 @@ #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (gnu packages) + #:use-module (gnu packages freedesktop) #:use-module (gnu packages glib) #:use-module (gnu packages gnuzilla) #:use-module (gnu packages linux) @@ -44,11 +46,28 @@ (sha256 (base32 "109w86kfqrgz83g9ivggplmgc77rz8kx8646izvm2jb57h4rbh71")) - (patches (list (search-patch "polkit-drop-test.patch"))))) + (patches (list (search-patch "polkit-drop-test.patch"))) + (modules '((guix build utils))) + (snippet + '(begin + (use-modules (guix build utils)) + (substitute* "configure" + ;; Replace libsystemd-login with libelogind. + (("libsystemd-login") "libelogind") + ;; Skip the sanity check that the current system runs + ;; systemd. + (("test ! -d /sys/fs/cgroup/systemd/") "false")) + (substitute* "src/polkit/polkitunixsession-systemd.c" + (("systemd") "elogind")) + (substitute* "src/polkitbackend/polkitbackendsessionmonitor-systemd.c" + (("systemd") "elogind")) + (substitute* "src/polkitbackend/polkitbackendjsauthority.c" + (("systemd") "elogind")))))) (build-system gnu-build-system) (inputs `(("expat" ,expat) ("glib:bin" ,glib "bin") ; for glib-mkenums + ("elogind" ,elogind) ("intltool" ,intltool) ("linux-pam" ,linux-pam) ("mozjs" ,mozjs) |