X-Git-Url: https://git.hcoop.net/jackhill/guix/guix.git/blobdiff_plain/c6d02bcf1bcc06c70e440221e317274926c0fce3..e0f983c0d55e301fc646d956039cc425ad18076d:/gnu/packages/display-managers.scm diff --git a/gnu/packages/display-managers.scm b/gnu/packages/display-managers.scm index 70caeab06d..6ea6e1a161 100644 --- a/gnu/packages/display-managers.scm +++ b/gnu/packages/display-managers.scm @@ -5,7 +5,11 @@ ;;; Copyright © 2017 Ricardo Wurmus ;;; Copyright © 2017 Sou Bunnbu ;;; Copyright © 2017 Marius Bakke -;;; Copyright © 2017 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2020 Tobias Geerinckx-Rice +;;; Copyright © 2020 L p R n d n +;;; Copyright © 2020 Fredrik Salomonsson +;;; Copyright © 2020 Vincent Legoll +;;; Copyright © 2021 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -26,9 +30,11 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix git-download) #:use-module (guix build-system cmake) #:use-module (guix build-system qt) #:use-module (guix build-system gnu) + #:use-module (guix build-system trivial) #:use-module (guix packages) #:use-module (guix utils) #:use-module (gnu packages) @@ -53,7 +59,7 @@ (define-public sddm (package (name "sddm") - (version "0.18.1") + (version "0.19.0") (source (origin (method url-fetch) (uri (string-append @@ -62,7 +68,7 @@ "sddm-" version ".tar.xz")) (sha256 (base32 - "0nilrhwlyvkngjgxfc08n73c16azgmw80pvx0a78xqww9y3hv4xh")))) + "0hcdysw8ibr66vk8i7v56l0v5ijvhlq67v4460mc2xf2910g2m72")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -122,19 +128,79 @@ create smooth, animated user interfaces.") ;; QML files are MIT licensed and images are CC BY 3.0. (license (list license:gpl2+ license:expat license:cc-by3.0)))) +(define-public guix-simplyblack-sddm-theme + (package + (name "guix-simplyblack-sddm-theme") + (version "0.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/plattfot/guix-simplyblack-sddm") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1fwny6b0xpjs8ad2b16pyxd27gf0sr0nillmhc2h5k0q7dva21vi")))) + (build-system trivial-build-system) + (arguments + `(#:modules ((guix build utils)) + #:builder + (begin + (use-modules (guix build utils)) + (let* ((out (assoc-ref %outputs "out")) + (sddm-themes (string-append out "/share/sddm/themes"))) + (mkdir-p sddm-themes) + (copy-recursively (assoc-ref %build-inputs "source") + (string-append sddm-themes "/guix-simplyblack-sddm")))))) + (home-page "https://github.com/plattfot/guix-simplyblack-sddm") + (synopsis "Guix based theme for SDDM") + (description + "This package provides a simple theme for SDDM, black background with +Guix's logo. Based on Arch linux's archlinux-simplyblack theme.") + ;; Theme under cc-by-sa3.0, guix logo under license:cc-by-sa4.0 + (license (list license:cc-by-sa3.0 license:cc-by-sa4.0)))) + +(define-public chili-sddm-theme + (package + (name "chili-sddm-theme") + (version "0.1.5") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/MarianArlt/sddm-chili") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "036fxsa7m8ymmp3p40z671z163y6fcsa9a641lrxdrw225ssq5f3")))) + (build-system trivial-build-system) + (arguments + `(#:modules ((guix build utils)) + #:builder + (begin + (use-modules (guix build utils)) + (let* ((out (assoc-ref %outputs "out")) + (sddm-themes (string-append out "/share/sddm/themes"))) + (mkdir-p sddm-themes) + (copy-recursively (assoc-ref %build-inputs "source") + (string-append sddm-themes "/chili")))))) + (home-page "https://github.com/MarianArlt/sddm-chili") + (synopsis "Chili theme for SDDM") + (description "Chili reduces all the clutter and leaves you with a clean, +easy to use, login interface with a modern yet classy touch.") + (license license:gpl3+))) + (define-public lightdm (package (name "lightdm") - (version "1.24.0") + (version "1.30.0") (source (origin (method url-fetch) - (uri (string-append "https://launchpad.net/lightdm/" - (version-major+minor version) "/" - version "/+download/lightdm-" - version ".tar.xz")) + (uri (string-append + "https://github.com/CanonicalLtd/lightdm/releases/download/" + version "/lightdm-" version ".tar.xz")) (sha256 (base32 - "18j33bm54i8k7ncxcs69zqi4105s62n58jrydqn3ikrb71s9nl6d")))) + "158zb2d0v1309a8v19hh32y4yj3v6yg4yg6m0l7v59d3a2b7f651")))) (build-system gnu-build-system) (arguments '(#:parallel-tests? #f ; fails when run in parallel @@ -153,12 +219,6 @@ create smooth, animated user interfaces.") (substitute* "src/seat.c" (("/bin/sh") (which "sh"))) #t)) - (add-after 'unpack 'disable-broken-tests - (lambda _ - (substitute* "tests/Makefile.in" - (("test-sessions-gobject ") "") - ((" test-sessions-python ") " ")) - #t)) (add-before 'check 'pre-check ;; Run test-suite under a dbus session. (lambda* (#:key inputs #:allow-other-keys) @@ -181,6 +241,7 @@ create smooth, animated user interfaces.") ("pkg-config" ,pkg-config) ("itstool" ,itstool) ("intltool" ,intltool) + ("vala" ,vala) ;for Vala bindings ;; For tests ("dbus" ,dbus) ("python" ,python-2) @@ -199,7 +260,7 @@ display manager which supports different greeters.") (define-public lightdm-gtk-greeter (package (name "lightdm-gtk-greeter") - (version "2.0.2") + (version "2.0.7") (source (origin (method url-fetch) (uri (string-append @@ -208,14 +269,46 @@ display manager which supports different greeters.") "/+download/lightdm-gtk-greeter-" version ".tar.gz")) (sha256 (base32 - "1436sdm83xqhxyr1rzqxhsl8if2xmidlvb341xcv6dv83lyxkrlf")))) + "1g7wc3d3vqfa7mrdhx1w9ywydgjbffla6rbrxq9k3sc62br97qms")))) (build-system gnu-build-system) + (arguments + `(#:configure-flags + (list (string-append "--enable-at-spi-command=" + (assoc-ref %build-inputs "at-spi2-core") + "/libexec/at-spi-bus-launcher")) + #:phases + (modify-phases %standard-phases + (add-after 'install 'fix-.desktop-file + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (substitute* (string-append + out "/share/xgreeters/lightdm-gtk-greeter.desktop") + (("Exec=lightdm-gtk-greeter") + (string-append "Exec=" out "/sbin/lightdm-gtk-greeter"))) + #t))) + (add-after 'fix-.desktop-file 'wrap-program + ;; Mimic glib-or-gtk build system + ;; which doesn't wrap files in /sbin + (lambda* (#:key outputs inputs #:allow-other-keys) + (let ((gtk (assoc-ref inputs "gtk+"))) + (wrap-program (string-append (assoc-ref outputs "out") + "/sbin/lightdm-gtk-greeter") + `("XDG_DATA_DIRS" ":" prefix + ,(cons "/run/current-system/profile/share" + (map (lambda (pkg) + (string-append (assoc-ref inputs pkg) "/share")) + '("gtk+" "shared-mime-info" "glib")))) + `("GTK_PATH" ":" prefix (,gtk)) + `("GIO_EXTRA_MODULES" ":" prefix (,gtk)))) + #t))))) (native-inputs `(("exo" ,exo) ("intltool" ,intltool) ("pkg-config" ,pkg-config))) (inputs `(("lightdm" ,lightdm) + ("shared-mime-info" ,shared-mime-info) + ("at-spi2-core" ,at-spi2-core) ("gtk+" ,gtk+))) (synopsis "GTK+ greeter for LightDM") (home-page "https://launchpad.net/lightdm-gtk-greeter")