gnu: wlgreet: Update to 0.4.1-1.7e79d60.
This is a follow-up to 0e9c2d2eba (sway 1.9
update), which breaks wlgreet 0.4.1.
Reported in <https://issues.guix.gnu.org/69667>.
* gnu/packages/admin.scm (wlgreet): Update to 0.4.1-1.7e79d60.
Change-Id: I81613baac01d366d6fc507203fca2cc95977df46
Reported-by: chris <chris@bumblehead.com>
			
			
This commit is contained in:
		
							parent
							
								
									fcf0fc0f33
								
							
						
					
					
						commit
						edfb05e16d
					
				
					 1 changed files with 64 additions and 62 deletions
				
			
		| 
						 | 
					@ -5516,71 +5516,73 @@ This allows greetd-pam-mount to auto-(un)mount @env{XDG_RUNTIME_DIR} without
 | 
				
			||||||
interfering with any pam-mount configuration.")))
 | 
					interfering with any pam-mount configuration.")))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
(define-public wlgreet
 | 
					(define-public wlgreet
 | 
				
			||||||
  (package
 | 
					  (let ((commit "7e79d6004fc5e765a5c3ece6d377f8c5999d9dfa")
 | 
				
			||||||
    (name "wlgreet")
 | 
					        (revision "1"))
 | 
				
			||||||
    (version "0.4.1")
 | 
					    (package
 | 
				
			||||||
    (source (origin
 | 
					      (name "wlgreet")
 | 
				
			||||||
             (method git-fetch)
 | 
					      (version (git-version "0.4.1" revision commit))
 | 
				
			||||||
             (uri (git-reference
 | 
					      (source (origin
 | 
				
			||||||
                   (url "https://git.sr.ht/~kennylevinsen/wlgreet")
 | 
					                (method git-fetch)
 | 
				
			||||||
                   (commit version)))
 | 
					                (uri (git-reference
 | 
				
			||||||
             (file-name (git-file-name name version))
 | 
					                      (url "https://git.sr.ht/~kennylevinsen/wlgreet")
 | 
				
			||||||
             (sha256
 | 
					                      (commit commit)))
 | 
				
			||||||
              (base32
 | 
					                (file-name (git-file-name name version))
 | 
				
			||||||
               "1k0jmgh0rjbnb49gkvs0a4d7z9xb6pad8v5w5f7my4s0rfpk7wd9"))))
 | 
					                (sha256
 | 
				
			||||||
    (build-system cargo-build-system)
 | 
					                 (base32
 | 
				
			||||||
    (arguments
 | 
					                  "039a05v6c2i3al86k4fncqr3z47dnrz7y8wmhx6wvm08zx8s89ww"))))
 | 
				
			||||||
     (list #:cargo-inputs
 | 
					      (build-system cargo-build-system)
 | 
				
			||||||
           `(("rust-chrono" ,rust-chrono-0.4)
 | 
					      (arguments
 | 
				
			||||||
             ("rust-getopts" ,rust-getopts-0.2)
 | 
					       (list #:cargo-inputs
 | 
				
			||||||
             ("rust-greetd-ipc" ,rust-greetd-ipc-0.9)
 | 
					             `(("rust-chrono" ,rust-chrono-0.4)
 | 
				
			||||||
             ("rust-lazy-static" ,rust-lazy-static-1)
 | 
					               ("rust-getopts" ,rust-getopts-0.2)
 | 
				
			||||||
             ("rust-memmap2" ,rust-memmap2-0.3)
 | 
					               ("rust-greetd-ipc" ,rust-greetd-ipc-0.9)
 | 
				
			||||||
             ("rust-nix" ,rust-nix-0.25)
 | 
					               ("rust-lazy-static" ,rust-lazy-static-1)
 | 
				
			||||||
             ("rust-os-pipe" ,rust-os-pipe-1)
 | 
					               ("rust-memmap2" ,rust-memmap2-0.3)
 | 
				
			||||||
             ("rust-rusttype" ,rust-rusttype-0.9)
 | 
					               ("rust-nix" ,rust-nix-0.25)
 | 
				
			||||||
             ("rust-serde" ,rust-serde-1)
 | 
					               ("rust-os-pipe" ,rust-os-pipe-1)
 | 
				
			||||||
             ("rust-smithay-client-toolkit"
 | 
					               ("rust-rusttype" ,rust-rusttype-0.9)
 | 
				
			||||||
              ,rust-smithay-client-toolkit-0.15)
 | 
					               ("rust-serde" ,rust-serde-1)
 | 
				
			||||||
             ("rust-toml" ,rust-toml-0.5)
 | 
					               ("rust-smithay-client-toolkit"
 | 
				
			||||||
             ("rust-wayland-client" ,rust-wayland-client-0.29)
 | 
					                ,rust-smithay-client-toolkit-0.15)
 | 
				
			||||||
             ("rust-wayland-protocols" ,rust-wayland-protocols-0.29))
 | 
					               ("rust-toml" ,rust-toml-0.5)
 | 
				
			||||||
           #:phases
 | 
					               ("rust-wayland-client" ,rust-wayland-client-0.29)
 | 
				
			||||||
           #~(modify-phases %standard-phases
 | 
					               ("rust-wayland-protocols" ,rust-wayland-protocols-0.29))
 | 
				
			||||||
               (add-after 'unpack 'remove-bundled-fonts
 | 
					             #:phases
 | 
				
			||||||
                 (lambda _
 | 
					             #~(modify-phases %standard-phases
 | 
				
			||||||
                   (delete-file-recursively "fonts")))
 | 
					                 (add-after 'unpack 'remove-bundled-fonts
 | 
				
			||||||
               (add-after 'remove-bundled-fonts 'fix-font-references
 | 
					                   (lambda _
 | 
				
			||||||
                 (lambda* (#:key inputs #:allow-other-keys)
 | 
					                     (delete-file-recursively "fonts")))
 | 
				
			||||||
                   (substitute* "src/draw.rs"
 | 
					                 (add-after 'remove-bundled-fonts 'fix-font-references
 | 
				
			||||||
                     (("\\.\\./fonts/dejavu/DejaVuSansMono\\.ttf" _)
 | 
					                   (lambda* (#:key inputs #:allow-other-keys)
 | 
				
			||||||
                      (search-input-file
 | 
					                     (substitute* "src/draw.rs"
 | 
				
			||||||
                       inputs
 | 
					                       (("\\.\\./fonts/dejavu/DejaVuSansMono\\.ttf" _)
 | 
				
			||||||
                       "share/fonts/truetype/DejaVuSansMono.ttf"))
 | 
					                        (search-input-file
 | 
				
			||||||
                     (("\\.\\./fonts/Roboto-Regular\\.ttf" _)
 | 
					                         inputs
 | 
				
			||||||
                      (search-input-file
 | 
					                         "share/fonts/truetype/DejaVuSansMono.ttf"))
 | 
				
			||||||
                       inputs
 | 
					                       (("\\.\\./fonts/Roboto-Regular\\.ttf" _)
 | 
				
			||||||
                       "share/fonts/truetype/Roboto-Regular.ttf")))))
 | 
					                        (search-input-file
 | 
				
			||||||
               (add-after 'configure 'fix-library-references
 | 
					                         inputs
 | 
				
			||||||
                 (lambda* (#:key inputs vendor-dir #:allow-other-keys)
 | 
					                         "share/fonts/truetype/Roboto-Regular.ttf")))))
 | 
				
			||||||
                   (substitute* (find-files vendor-dir "\\.rs$")
 | 
					                 (add-after 'configure 'fix-library-references
 | 
				
			||||||
                     (("lib(wayland-.*|xkbcommon)\\.so" so-file)
 | 
					                   (lambda* (#:key inputs vendor-dir #:allow-other-keys)
 | 
				
			||||||
                      (search-input-file
 | 
					                     (substitute* (find-files vendor-dir "\\.rs$")
 | 
				
			||||||
                       inputs
 | 
					                       (("lib(wayland-.*|xkbcommon)\\.so" so-file)
 | 
				
			||||||
                       (string-append "lib/" so-file)))))))))
 | 
					                        (search-input-file
 | 
				
			||||||
    (inputs
 | 
					                         inputs
 | 
				
			||||||
     (list font-dejavu
 | 
					                         (string-append "lib/" so-file)))))))))
 | 
				
			||||||
           font-google-roboto
 | 
					      (inputs
 | 
				
			||||||
           libxkbcommon
 | 
					       (list font-dejavu
 | 
				
			||||||
           wayland))
 | 
					             font-google-roboto
 | 
				
			||||||
    (home-page "https://git.sr.ht/~kennylevinsen/wlgreet")
 | 
					             libxkbcommon
 | 
				
			||||||
    (synopsis "Bare-bones Wayland-based greeter for @command{greetd}")
 | 
					             wayland))
 | 
				
			||||||
    (description
 | 
					      (home-page "https://git.sr.ht/~kennylevinsen/wlgreet")
 | 
				
			||||||
     "@command{wlgreet} provides a @command{greetd} greeter
 | 
					      (synopsis "Bare-bones Wayland-based greeter for @command{greetd}")
 | 
				
			||||||
 | 
					      (description
 | 
				
			||||||
 | 
					       "@command{wlgreet} provides a @command{greetd} greeter
 | 
				
			||||||
that runs on a Wayland compositor such as @command{sway}.  It
 | 
					that runs on a Wayland compositor such as @command{sway}.  It
 | 
				
			||||||
is implemented with pure Wayland APIs, so it does not depend
 | 
					is implemented with pure Wayland APIs, so it does not depend
 | 
				
			||||||
on a GUI toolkit.")
 | 
					on a GUI toolkit.")
 | 
				
			||||||
    (license license:gpl3)))
 | 
					      (license license:gpl3))))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
(define-public libseat
 | 
					(define-public libseat
 | 
				
			||||||
  (package
 | 
					  (package
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Reference in a new issue