diff mbox series

[bug#61331,3/6] gnu: Update wlroots to 0.16.1.

Message ID 20230206232617.yokszg43hrv2g5iw@blackbox
State New
Headers show
Series [bug#61331,core-updates] Update wayland, ..., sway | expand

Commit Message

Gabriel Wicki Feb. 6, 2023, 11:26 p.m. UTC 
From 736f047384082f4eaa1ed1414ec3e0595ec19816 Mon Sep 17 00:00:00 2001
From: Gabriel Wicki <gabriel@erlikon.ch>
Date: Sun, 5 Feb 2023 00:27:20 +0100
Subject: [PATCH 3/6] gnu: Update wlroots to 0.16.1.

* gnu/packages/wm.scm (wlroots): Update to version 0.16.1.
---
 gnu/packages/wm.scm | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)
diff mbox series

Patch

diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index a860ed1f93..8f812bc14b 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -101,6 +101,7 @@  (define-module (gnu packages wm)
   #:use-module (gnu packages build-tools)
   #:use-module (gnu packages calendar)
   #:use-module (gnu packages check)
+  #:use-module (gnu packages cmake)
   #:use-module (gnu packages datastructures)
   #:use-module (gnu packages docbook)
   #:use-module (gnu packages documentation)
@@ -130,6 +131,7 @@  (define-module (gnu packages wm)
   #:use-module (gnu packages maths)
   #:use-module (gnu packages mpd)
   #:use-module (gnu packages pcre)
+  #:use-module (gnu packages pciutils)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages pretty-print)
@@ -146,6 +148,7 @@  (define-module (gnu packages wm)
   #:use-module (gnu packages textutils)
   #:use-module (gnu packages time)
   #:use-module (gnu packages video)
+  #:use-module (gnu packages vulkan)
   #:use-module (gnu packages web)
   #:use-module (gnu packages xdisorg)
   #:use-module (gnu packages xml)
@@ -1538,16 +1541,16 @@  (define-public polybar
 (define-public wlroots
   (package
     (name "wlroots")
-    (version "0.14.1")
+    (version "0.16.1")
     (source
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/swaywm/wlroots")
+             (url "https://gitlab.freedesktop.org/wlroots/wlroots.git")
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1sshp3lvlkl1i670kxhwsb4xzxl8raz6769kqvgmxzcb63ns9ay1"))))
+        (base32 "11kcica9waj1a1xgbi12gif9z5z0b4xzycbcgawbgdmj77pws8sk"))))
     (build-system meson-build-system)
     (arguments
      `(#:phases
@@ -1558,7 +1561,16 @@  (define-public wlroots
                (("Xwayland") (string-append (assoc-ref inputs
                                                        "xorg-server-xwayland")
                                             "/bin/Xwayland")))
+             #t))
+         (add-before 'configure 'fix-meson-file
+           (lambda* (#:key inputs #:allow-other-keys)
+             (substitute* "backend/drm/meson.build"
+               (("/usr/share/hwdata/pnp.ids")
+                (string-append (assoc-ref inputs "hwdata")
+                               "/share/hwdata/pnp.ids")))
              #t)))))
+    (inputs (list cmake
+                  `(,hwdata "pnp")))
     (propagated-inputs
      (list ;; As required by wlroots.pc.
            eudev
@@ -1567,8 +1579,9 @@  (define-public wlroots
            mesa
            pixman
            libseat
+           vulkan-headers
            wayland
-           wayland-protocols
+           wayland-protocols-next
            xcb-util-errors
            xcb-util-wm
            xorg-server-xwayland))