gnu: elogind: Update to version 219.12.

* gnu/packages/freedesktop.scm (elogind): Update to 219.12.  Use a tarball
  instead of a git checkout.
This commit is contained in:
Andy Wingo 2015-08-18 10:05:24 +02:00
parent 0c14675075
commit 5c91962afe
1 changed files with 48 additions and 56 deletions

View File

@ -41,6 +41,7 @@
#:use-module (gnu packages xdisorg) #:use-module (gnu packages xdisorg)
#:use-module (gnu packages xorg) #:use-module (gnu packages xorg)
#:use-module (gnu packages boost) #:use-module (gnu packages boost)
#:use-module (gnu packages m4)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages doxygen) #:use-module (gnu packages doxygen)
#:use-module (gnu packages libffi) #:use-module (gnu packages libffi)
@ -130,65 +131,56 @@ the freedesktop.org XDG Base Directory specification.")
(license license:expat))) (license license:expat)))
(define-public elogind (define-public elogind
(let ((commit "14405a9")) (package
(package (name "elogind")
(name "elogind") (version "219.12")
(version (string-append "219." commit)) (source (origin
(source (origin (method url-fetch)
(method git-fetch) (uri (string-append "https://wingolog.org/pub/" name "/"
(uri (git-reference name "-" version ".tar.xz"))
(url "http://git.elephly.net/software/elogind.git") (sha256
(commit commit))) (base32
(sha256 "13qc4f0dl7ynnfp1y565z2k0jjizly5w3dqhiqkdk7v6jr4pksb7"))
(base32 (modules '((guix build utils)))
"1wz5lxj95qg64x2q5hf4zcb35hpxlw3wfswx6sb2srvsg50y3y72")) (snippet
(file-name (string-append name "-checkout-" commit)) '(begin
(modules '((guix build utils))) (use-modules (guix build utils))
(snippet (substitute* "Makefile.am"
'(begin ;; Avoid validation against DTD because the DTDs for
(use-modules (guix build utils)) ;; both doctype 4.2 and 4.5 are needed.
(substitute* "Makefile.am" (("XSLTPROC_FLAGS = ") "XSLTPROC_FLAGS = --novalid"))))))
;; Avoid validation against DTD because the DTDs for (build-system gnu-build-system)
;; both doctype 4.2 and 4.5 are needed. (arguments
(("XSLTPROC_FLAGS = ") "XSLTPROC_FLAGS = --novalid")))))) `(#:configure-flags
(build-system gnu-build-system) (list (string-append "--with-libcap="
(arguments (assoc-ref %build-inputs "libcap"))
`(#:configure-flags (string-append "--with-udevrulesdir="
(list (assoc-ref %outputs "out")
;; pam_elogind fails because of bus-error.c hackery "/lib/udev/rules.d"))
"--disable-pam" #:make-flags '("PKTTYAGENT=/run/current-system/profile/bin/pkttyagent")))
(string-append "--with-rootprefix=" (assoc-ref %outputs "out"))) (native-inputs
#:phases `(("intltool" ,intltool)
(modify-phases %standard-phases ("gettext" ,gnu-gettext)
(add-after 'unpack 'autogen ("docbook-xsl" ,docbook-xsl)
(lambda _ ("docbook-xml" ,docbook-xml)
(and (zero? (system* "intltoolize" "--force" "--automake")) ("xsltproc" ,libxslt)
(zero? (system* "autoreconf" "-vif")))))))) ("m4" ,m4)
(native-inputs ("libxml2" ,libxml2) ;for XML_CATALOG_FILES
`(("intltool" ,intltool) ("pkg-config", pkg-config)
("gettext" ,gnu-gettext) ("gperf" ,gperf)))
("docbook-xsl" ,docbook-xsl) (inputs
("docbook-xml" ,docbook-xml) `(("linux-pam" ,linux-pam)
("xsltproc" ,libxslt) ("linux-libre-headers" ,linux-libre-headers)
("libxml2" ,libxml2) ;for XML_CATALOG_FILES ("libcap" ,libcap)
("pkg-config", pkg-config) ("dbus" ,dbus)
("autoconf" ,autoconf) ("eudev" ,eudev)))
("automake" ,automake) (home-page "https://github.com/andywingo/elogind")
("libtool" ,libtool) (synopsis "User, seat, and session management service")
("gperf" ,gperf))) (description "Elogind is the systemd project's \"logind\" service,
(inputs
`(("linux-pam" ,linux-pam)
("linux-libre-headers" ,linux-libre-headers)
("libcap" ,libcap)
("dbus" ,dbus)
("eudev" ,eudev)))
(home-page "https://github.com/andywingo/elogind")
(synopsis "User, seat, and session management service")
(description "Elogind is the systemd project's \"logind\" service,
extracted out as a separate project. Elogind integrates with PAM to provide extracted out as a separate project. Elogind integrates with PAM to provide
the org.freedesktop.login1 interface over the system bus, allowing other parts the org.freedesktop.login1 interface over the system bus, allowing other parts
of a the system to know what users are logged in, and where.") of a the system to know what users are logged in, and where.")
(license license:lgpl2.1+)))) (license license:lgpl2.1+)))
(define-public python-pyxdg (define-public python-pyxdg
(package (package