diff mbox series

[bug#69430,1/2] gnu: sway: Update to 1.9.

Message ID 75e2cd50e71e8b3289a8493d1db94dbfbfa1ac63.1709049313.git.hako@ultrarare.space
State New
Headers
Series [bug#69430,1/2] gnu: sway: Update to 1.9. |

Commit Message

Hilton Chain Feb. 27, 2024, 3:56 p.m. UTC 
  * 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(-)


base-commit: 75bad75367fcf2c289fae3b40dbcc850f92177be
prerequisite-patch-id: c615f2b08070db6cbe847a2bdd5b7c0aae79789b
prerequisite-patch-id: fd7da036342f36a8c698f5c8975f9e48d3ade435
prerequisite-patch-id: a2c81c14423bb9858f33d7d26976e8eea61982b7
prerequisite-patch-id: e30fd25b1dc4aaaff76474153836cd48e8565eb9
prerequisite-patch-id: 1d070b26dc64ee2ec95f14c4f5fc23419f766810
prerequisite-patch-id: 03de992f0312d5f0ee3368ebc3c1fad7c955d095
prerequisite-patch-id: b330efe2b0713e30b766c3b84643df67eb1eae5d
prerequisite-patch-id: a233d53e8895d3f82af872fffb2e3858f44ceb23
prerequisite-patch-id: a2b6bd60bc05d7b5a75f15a06b1b614afd6a7033
prerequisite-patch-id: 9d60e5fdd3f1418caf15820650dd8c090c291c2b
prerequisite-patch-id: 46d4907ae64a79ec05a25ffc392868139c6d6e0f

Comments

Hilton Chain March 9, 2024, 3:19 a.m. UTC | #1 
Applied as 0e9c2d2eba5e573e43382611474784c8bf5a4309 and
5759e8be03486f780104a400e020992acd2982d1, closing.
diff mbox series

Patch

diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index ae8213ddae..90d61d1d86 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -1757,7 +1757,7 @@  (define-public wlroots-0.16
 (define-public sway
   (package
     (name "sway")
-    (version "1.8.1")
+    (version "1.9")
     (source
      (origin
        (method git-fetch)
@@ -1766,7 +1766,7 @@  (define-public sway
              (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
@@ -1781,11 +1781,6 @@  (define-public sway
                (("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
@@ -1798,7 +1793,7 @@  (define-public sway
                   pcre2
                   swaybg
                   wayland
-                  wlroots-0.16))
+                  wlroots))
     (native-inputs
      (cons* linux-pam mesa pkg-config scdoc wayland-protocols
             (if (%current-target-system)