Archived
1
0
Fork 0

gnu: lightdm: Update to 1.30.0-0.b7fc321.

* gnu/packages/display-managers.scm (lightdm): Update to 1.30.0-0.b7fc321.
[source]: Use git.
[configure-flags]: Add CFLAGS=-Wno-error=missing-prototypes.
[phases]: Delete trailing #t.
{fix-paths}: Use search-input-file.
[inputs]: Add coreutils.
[native-inputs]: Use new style.  Replace python-2 by python-wrapper and
python2-pygobject by python-pygobject.  Add autoconf, automake, gtk-doc,
libtool, which and yelp-tools.
This commit is contained in:
Maxim Cournoyer 2022-05-01 02:20:05 -04:00
parent fa48004614
commit 26876b6600
No known key found for this signature in database
GPG key ID: 1260E46482E63562

View file

@ -12,6 +12,7 @@
;;; Copyright © 2021 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2021 Zheng Junjie <873216071@qq.com>
;;; Copyright © 2021 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2021 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2021 Petr Hodina <phodina@protonmail.com> ;;; Copyright © 2021 Petr Hodina <phodina@protonmail.com>
;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -41,7 +42,9 @@
#:use-module (guix utils) #:use-module (guix utils)
#:use-module (guix gexp) #:use-module (guix gexp)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages autotools)
#:use-module (gnu packages admin) #:use-module (gnu packages admin)
#:use-module (gnu packages base)
#:use-module (gnu packages bash) #:use-module (gnu packages bash)
#:use-module (gnu packages fontutils) #:use-module (gnu packages fontutils)
#:use-module (gnu packages freedesktop) #:use-module (gnu packages freedesktop)
@ -252,62 +255,78 @@ experience for your users, your family and yourself")
(license license:gpl3+))) (license license:gpl3+)))
(define-public lightdm (define-public lightdm
;; Use the latest commit, as the current official release doesn't build with
;; glib >= 2.33.
(let ((revision "0")
(commit "b7fc3214cbaed09c73e963847443a0d648dfd896"))
(package (package
(name "lightdm") (name "lightdm")
(version "1.30.0") (version (git-version "1.30.0" revision commit))
(source (origin (source (origin
(method url-fetch) (method git-fetch)
(uri (string-append (uri (git-reference
"https://github.com/CanonicalLtd/lightdm/releases/download/" (url "https://github.com/canonical/lightdm")
version "/lightdm-" version ".tar.xz")) (commit commit)))
(file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"158zb2d0v1309a8v19hh32y4yj3v6yg4yg6m0l7v59d3a2b7f651")))) "0378jacazpmdgdjkiilk3mbikz3iysb4s9q40hg9zv4yngwsix1m"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:parallel-tests? #f ; fails when run in parallel '(#:parallel-tests? #f ; fails when run in parallel
#:configure-flags #:configure-flags
(list "--localstatedir=/var") (list "--localstatedir=/var"
;; Otherwise the test suite fails on such a warning.
"CFLAGS=-Wno-error=missing-prototypes")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'fix-paths (add-after 'unpack 'fix-paths
(lambda _ (lambda* (#:key inputs #:allow-other-keys)
(substitute* "src/shared-data-manager.c" (substitute* "src/shared-data-manager.c"
(("/bin/rm") (which "rm"))) (("/bin/rm")
(search-input-file inputs "bin/rm")))
(substitute* '("data/users.conf" (substitute* '("data/users.conf"
"common/user-list.c") "common/user-list.c")
(("/bin/false") (which "false")) (("/bin/false")
(("/usr/sbin/nologin") (which "nologin"))) (search-input-file inputs "bin/false"))
(("/usr/sbin/nologin")
(search-input-file inputs "sbin/nologin")))
(substitute* "src/seat.c" (substitute* "src/seat.c"
(("/bin/sh") (which "sh"))) (("/bin/sh")
#t)) (search-input-file inputs "bin/sh")))))
(add-before 'check 'pre-check (add-before 'check 'pre-check
;; Run test-suite under a dbus session. ;; Run test-suite under a dbus session.
(lambda* (#:key inputs #:allow-other-keys) (lambda _
(wrap-program "tests/src/test-python-greeter" (wrap-program "tests/src/test-python-greeter"
`("GUIX_PYTHONPATH" ":" prefix (,(getenv "GUIX_PYTHONPATH"))) `("GUIX_PYTHONPATH" ":" prefix (,(getenv "GUIX_PYTHONPATH")))
`("GI_TYPELIB_PATH" ":" prefix (,(getenv "GI_TYPELIB_PATH")))) `("GI_TYPELIB_PATH" ":" prefix (,(getenv "GI_TYPELIB_PATH"))))
;; Avoid printing locale warnings, which trip up the text ;; Avoid printing locale warnings, which trip up the text
;; matching tests. ;; matching tests.
(unsetenv "LC_ALL") (unsetenv "LC_ALL"))))))
#t)))))
(inputs (inputs
(list audit (list audit
coreutils ;for cross-compilation
linux-pam linux-pam
shadow ;for sbin/nologin shadow ;for sbin/nologin
libgcrypt libgcrypt
libxcb)) libxcb))
(native-inputs (native-inputs
`(("gobject-introspection" ,gobject-introspection) (list autoconf
("pkg-config" ,pkg-config) automake
("itstool" ,itstool) gobject-introspection
("intltool" ,intltool) gtk-doc
("vala" ,vala) ;for Vala bindings pkg-config
itstool
intltool
libtool
vala ;for Vala bindings
;; For tests ;; For tests
("dbus" ,dbus) dbus
("python" ,python-2) ;; python-wrapper
("python-pygobject" ,python2-pygobject))) ;; python-pygobject
which
yelp-tools))
;; Required by liblightdm-gobject-1.pc. ;; Required by liblightdm-gobject-1.pc.
(propagated-inputs (propagated-inputs
(list glib libx11 libxklavier)) (list glib libx11 libxklavier))
@ -315,7 +334,7 @@ experience for your users, your family and yourself")
(synopsis "Lightweight display manager") (synopsis "Lightweight display manager")
(description "The Light Display Manager (LightDM) is a cross-desktop (description "The Light Display Manager (LightDM) is a cross-desktop
display manager which supports different greeters.") display manager which supports different greeters.")
(license license:gpl3+))) (license license:gpl3+))))
(define-public lightdm-gtk-greeter (define-public lightdm-gtk-greeter
(package (package