From mboxrd@z Thu Jan 1 00:00:00 1970 From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) Subject: Re: elogind WIP Date: Thu, 23 Apr 2015 23:08:57 +0200 Message-ID: <87tww6blhy.fsf@gnu.org> References: <87383vw5tc.fsf@pobox.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:37508) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YlOMv-0006z1-FQ for guix-devel@gnu.org; Thu, 23 Apr 2015 17:09:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YlOMr-0001y8-LA for guix-devel@gnu.org; Thu, 23 Apr 2015 17:09:09 -0400 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:55890) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YlOMr-0001y2-HQ for guix-devel@gnu.org; Thu, 23 Apr 2015 17:09:05 -0400 In-Reply-To: <87383vw5tc.fsf@pobox.com> (Andy Wingo's message of "Mon, 20 Apr 2015 10:40:47 +0200") List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: Andy Wingo Cc: guix-devel@gnu.org --=-=-= Content-Type: text/plain Thanks for getting this started! For the record, I went a bit further building it (patch attached), but now I think we stuck because some of the XSL files used to produce man pages are missing in the repo: --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 386f4c5..ecfe7ea 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -1,6 +1,8 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright =C2=A9 2015 Andreas Enge ;;; Copyright =C2=A9 2015 Sou Bunnbu +;;; Copyright =C2=A9 2015 Andy Wingo +;;; Copyright =C2=A9 2015 Ludovic Court=C3=A8s ;;; ;;; This file is part of GNU Guix. ;;; @@ -18,12 +20,19 @@ ;;; along with GNU Guix. If not, see . =20 (define-module (gnu packages freedesktop) - #:use-module ((guix licenses) #:select (expat x11)) + #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix git-download) #:use-module (guix build-system gnu) #:use-module (gnu packages linux) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages autotools) + #:use-module (gnu packages gettext) + #:use-module (gnu packages gperf) + #:use-module (gnu packages xml) + #:use-module (gnu packages docbook) + #:use-module (gnu packages glib) ;intltool #:use-module (gnu packages xdisorg) #:use-module (gnu packages xorg)) =20 @@ -48,7 +57,7 @@ (description "The xdg-utils package is a set of simple scripts that provide basic desktop integration functions in the framework of the freedesktop.org project.") - (license expat))) + (license license:expat))) =20 (define-public libinput (package @@ -74,4 +83,67 @@ freedesktop.org project.") (description "Libinput is a library to handle input devices for display servers and other applications that need to directly deal with input devices.") - (license x11))) + (license license:x11))) + +(define-public elogind + (let ((commit "b952404")) + (package + (name "elogind") + (version (string-append "219." commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/andywingo/elogind") + (commit commit))) + (sha256 + (base32 + "0h54jw7h8csgfcjnyhijpmic5511jj0z5ln03p0b0mx0gvm11lsa")) + (modules '((guix build utils))) + (snippet + '(begin + (use-modules (guix build utils)) + + ;; Remove reference to nonexistent file. + (substitute* "Makefile.am" + (("shell-completion/zsh/_systemd-inhibit") + "") + (("shell-completion/zsh/_loginctl \\\\") + "shell-completion/zsh/_loginctl")) + + ;; Rename this PAM configuration file to match what + ;; Makefile.am expects. + (rename-file "src/login/systemd-user" + "src/login/elogind-user"))))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'autogen + (lambda _ + (and (zero? (system* "intltoolize" "--force" "--au= tomake")) + (zero? (system* "autoreconf" "-vif")))))))) + (native-inputs + `(("intltool" ,intltool) + ("gettext" ,gnu-gettext) + ("docbook-xsl" ,docbook-xsl) + ("docbook-xml" ,docbook-xml-4.2) + ("xsltproc" ,libxslt) + ("libxml2" ,libxml2) ;for XML_CATALOG_FILES + ("pkg-config", pkg-config) + ("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool) + ("gperf" ,gperf))) + (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 provi= de +the org.freedesktop.login1 interface over the system bus, allowing other p= arts +of a the system to know what users are logged in, and where.") + (license license:lgpl2.1+)))) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Who=E2=80=99s willing to continue? Thanks, Ludo=E2=80=99. --=-=-=--