guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

06/13: gnu: sway: Update to 1.9.


From: guix-commits
Subject: 06/13: gnu: sway: Update to 1.9.
Date: Fri, 8 Mar 2024 22:15:39 -0500 (EST)

hako pushed a commit to branch master
in repository guix.

commit 0e9c2d2eba5e573e43382611474784c8bf5a4309
Author: Hilton Chain <hako@ultrarare.space>
AuthorDate: Tue Feb 27 23:48:25 2024 +0800

    gnu: sway: Update to 1.9.
    
    * gnu/packages/wm.scm (sway): Update to 1.9.
    [arguments]<#:phases>: Don't hardcode path to scdoc.
    [inputs]: Replace wlroots-0.16 with wlroots.
    
    Change-Id: I2108e57180a91dc2873d5398dc5f6981002e1c3d
---
 gnu/packages/wm.scm | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index 8ed3ed1107..9c0f5e38bd 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -1762,7 +1762,7 @@ modules for building a Wayland compositor.")
 (define-public sway
   (package
     (name "sway")
-    (version "1.8.1")
+    (version "1.9")
     (source
      (origin
        (method git-fetch)
@@ -1771,7 +1771,7 @@ modules for building a Wayland compositor.")
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1y7brfrsjnm9gksijgnr6zxqiqvn06mdiwsk5j87ggmxazxd66av"))))
+        (base32 "1n36vgpi4bg2gkiq4fam4khly1z9bjinmjclzq5vfx0z8h7a5bzz"))))
     (build-system meson-build-system)
     (arguments
      `(;; elogind is propagated by wlroots -> libseat
@@ -1786,11 +1786,6 @@ modules for building a Wayland compositor.")
                (("strdup..swaybg..")
                 (string-append "strdup(\"" (assoc-ref inputs "swaybg")
                                "/bin/swaybg\")")))
-             ;; Hardcode path to scdoc.
-             (substitute* "meson.build"
-               (("scdoc.get_pkgconfig_variable..scdoc..")
-                (string-append "'" (assoc-ref inputs "scdoc")
-                               "/bin/scdoc'")))
              #t)))))
     (inputs (list basu
                   cairo
@@ -1803,7 +1798,7 @@ modules for building a Wayland compositor.")
                   pcre2
                   swaybg
                   wayland
-                  wlroots-0.16))
+                  wlroots))
     (native-inputs
      (cons* linux-pam mesa pkg-config scdoc wayland-protocols
             (if (%current-target-system)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]