From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id ICz4JLGaQ2Gy0wAAgWs5BA (envelope-from ) for ; Thu, 16 Sep 2021 21:27:45 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id 0HV7ILGaQ2G7WwAAB5/wlQ (envelope-from ) for ; Thu, 16 Sep 2021 19:27:45 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 24402FB8 for ; Thu, 16 Sep 2021 21:27:45 +0200 (CEST) Received: from localhost ([::1]:50478 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mQx2s-0003hr-Lc for larch@yhetil.org; Thu, 16 Sep 2021 15:27:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35756) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQx2E-0003eO-H8 for guix-patches@gnu.org; Thu, 16 Sep 2021 15:27:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45062) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mQx2E-0000ty-9C for guix-patches@gnu.org; Thu, 16 Sep 2021 15:27:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mQx2E-0004SI-5l for guix-patches@gnu.org; Thu, 16 Sep 2021 15:27:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50627] [PATCH 2/2] gnu: Fix wayland-protocols dependency to be in native-inputs. Resent-From: muradm Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 16 Sep 2021 19:27:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50627 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50627@debbugs.gnu.org Received: via spool by 50627-submit@debbugs.gnu.org id=B50627.163182041517099 (code B ref 50627); Thu, 16 Sep 2021 19:27:02 +0000 Received: (at 50627) by debbugs.gnu.org; 16 Sep 2021 19:26:55 +0000 Received: from localhost ([127.0.0.1]:56607 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mQx26-0004Ri-0J for submit@debbugs.gnu.org; Thu, 16 Sep 2021 15:26:54 -0400 Received: from nomad-cl1.staging.muradm.net ([139.162.159.157]:58068 helo=nomad-cl1.muradm.net) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mQx22-0004RN-4H for 50627@debbugs.gnu.org; Thu, 16 Sep 2021 15:26:51 -0400 Received: from [176.234.10.27] (port=7530 helo=localhost) by nomad-cl1.muradm.net with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1mQx22-0000Y8-8M for 50627@debbugs.gnu.org; Thu, 16 Sep 2021 19:26:50 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=muradm.net; s=mail; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Sender:Reply-To:Cc:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=AHsKd9pOi7rTvlpAYVYqziRkCRLBm82WvFhZJSCdaQk=; b=BuxaebyWeMMb+JU96rlVK0IiaL Tyh5sPDk47OXglNQbXWP+D5W2LCgdvime+jprWk8NYUtPAjamiMOg9f362Aa7FYFMCjgboGBnCX4U VyzmV/xFwkFxzMwFg7r0JWXsTeRdJX9oZtuvBKf1tvTkKujAS100zBuQh0tiXLeQaC2HHyrkxhuda 2DRm2Fs0QluXEj6jyzEbFwC02r4R2oN90goyr5oLhN4xVLcu59v6uSVZeQKY2I1Aa2PUJJbMd+RST WuOJ01ASIXO2yAUZBnNFZ/PXT7TrQPRqVmCGFE/ie4lfJsmAi16x2K64/5Oa+gnVv68p2eXCx26es 83Ioiyumn47cs1f24aM9wkqHJtugVt2/AkjC3LkzggDOVmTlkc/nSNOj1gDAF3SVsbfoQ6/g78ouL CANqx6NDzMxyOOvb7H/DIcPSM+GWZbkSGS5FfcighUIL7e9/uUL8wPFW2TojatmTCk8fC5kpSailC RihXBvbjHU0uzAEBO8939Vzj; Received: from muradm by localhost with local (Exim 4.94.2) (envelope-from ) id 1mQx1z-0007jf-JK for 50627@debbugs.gnu.org; Thu, 16 Sep 2021 22:26:47 +0300 From: muradm Date: Thu, 16 Sep 2021 22:26:46 +0300 Message-Id: <20210916192646.29726-2-mail@muradm.net> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210916192646.29726-1-mail@muradm.net> References: <20210916192331.29606-1-mail@muradm.net> <20210916192646.29726-1-mail@muradm.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1631820465; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=AHsKd9pOi7rTvlpAYVYqziRkCRLBm82WvFhZJSCdaQk=; b=jzVb70g6RDfMQ1J+1GU7V+1XyFPt0HD1poDj/9ab6Ikfqaw3QfcIeNjjWzjZmLvP5DVP0W WhJKFzo0RVQSvHFkGxGUHzOt5Oy4Nop5j3GkyXVSqe9D6erNbT43IKsWJ895wt1S3SJHcs eGsMZDp9y9usvkQRwNZ2PTjpcscroNiCD58LGo4ObPB9yFFx9MiOy8WW046zKbRR8V4zGe GXML5pMtI7kC1LdJkbjuIczZi44daQdl1LowCxD73xyxS6jmow/O0l2T0GBH3GU4CVSlj6 PsaZJif1XKmSzn/36b6WNHMVDDv2O+lTYhA2gaRLQc6Dopeo9jGQFHu82DSdtg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1631820465; a=rsa-sha256; cv=none; b=EC0XnRwTPfdStg3ehzD5WEuBzcTB1ARKv9rIi2Il+n4jnYbuKuHoDMmCxfGhlP5bDpWG99 FiY+/ddFUsKuYUkPsCbrNy4AVBxMIvpXdaPRKD6IOyjBlaiJEaOL9yH4v2z+En3iqBRZRI LXN2bs0ganVTRlL63uQWEu5voN8MtuE8CvIWQzAr8oGI1/eUGh1FONAG9MiNSYYvFgPO2O 7ZHgLUdK5g6gBHATXIf9tR6bs1bMiH7FGxBxd+Uvu2ZIqYpfqKWqbLkkpvnTZbTTrahX0+ gmgJooOVK+OueS8/f4xVhpXfQPzQ/J2i5Q8H8Zy7osYlerGnbrkv5r6XxTrChg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=muradm.net header.s=mail header.b=BuxaebyW; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: 5.10 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=muradm.net header.s=mail header.b=BuxaebyW; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 24402FB8 X-Spam-Score: 5.10 X-Migadu-Scanner: scn1.migadu.com X-TUID: 3bOliafI0xaS While wayland-protocols is a build time dependency, some packages used it in normal inputs or even propagated-inputs. This moves wayland-protocols dependency to native-inputs across related packages. * gnu/packages/arcan.scm (arcan-wayland): updated * gnu/packages/enlightenment.scm (efl): updated * gnu/packages/enlightenment.scm (enlightenment): updated * gnu/packages/fcitx5.scm (fcitx5): updated * gnu/packages/freedesktop.scm (weston): updated * gnu/packages/freedesktop.scm (wev): updated * gnu/packages/freedesktop.scm (xdg-desktop-portal-wlr): updated * gnu/packages/gl.scm (mesa): updated * gnu/packages/gl.scm (glmark2): updated * gnu/packages/image.scm (grim): updated * gnu/packages/image.scm (slurp): updated * gnu/packages/julia-jll.scm (julia-wayland-protocols-jll): updated * gnu/packages/kde-frameworks.scm (kwayland): updated * gnu/packages/kodi.scm (kodi/wayland): updated * gnu/packages/language.scm (nimf): updated * gnu/packages/sdl.scm (sdl2): updated * gnu/packages/video.scm (vlc): updated * gnu/packages/video.scm (mpv): updated * gnu/packages/video.scm (obs): updated * gnu/packages/video.scm (obs-wlrobs): updated * gnu/packages/video.scm (wlstream): updated * gnu/packages/video.scm (wf-recorder): updated * gnu/packages/wm.scm (wlroots): updated * gnu/packages/xdisorg.scm (bemenu): updated * gnu/packages/xdisorg.scm (libxkbcommon): updated * gnu/packages/xdisorg.scm (wob): updated * gnu/packages/xdisorg.scm (wl-clipboard): updated * gnu/packages/xorg.scm (xorg-server-xwayland): updated --- gnu/packages/arcan.scm | 6 +++--- gnu/packages/enlightenment.scm | 10 +++++----- gnu/packages/fcitx5.scm | 4 ++-- gnu/packages/freedesktop.scm | 14 +++++++------- gnu/packages/gl.scm | 10 +++++----- gnu/packages/image.scm | 12 ++++++------ gnu/packages/julia-jll.scm | 2 +- gnu/packages/kde-frameworks.scm | 6 +++--- gnu/packages/kodi.scm | 4 +++- gnu/packages/language.scm | 2 +- gnu/packages/sdl.scm | 5 +++-- gnu/packages/video.scm | 28 ++++++++++++++-------------- gnu/packages/wm.scm | 4 ++-- gnu/packages/xdisorg.scm | 20 ++++++++++---------- gnu/packages/xorg.scm | 4 +++- 15 files changed, 68 insertions(+), 63 deletions(-) diff --git a/gnu/packages/arcan.scm b/gnu/packages/arcan.scm index 721cd7fd70..da7e445d1e 100644 --- a/gnu/packages/arcan.scm +++ b/gnu/packages/arcan.scm @@ -251,14 +251,14 @@ as a window under Arcan.") (inherit arcan) (name "arcan-wayland") (native-inputs - `(("pkg-config" ,pkg-config))) + `(("pkg-config" ,pkg-config) + ("wayland-protocols" ,wayland-protocols))) (inputs `(("arcan" ,arcan) ("libseccomp" ,libseccomp) ("libxkbcommon" ,libxkbcommon) ("mesa" ,mesa) - ("wayland" ,wayland) - ("wayland-protocols" ,wayland-protocols))) + ("wayland" ,wayland))) (arguments `(#:tests? #f #:phases diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index 9c83e9b482..63237539aa 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -82,7 +82,8 @@ (native-inputs `(("check" ,check-0.14) ("gettext" ,gettext-minimal) - ("pkg-config" ,pkg-config))) + ("pkg-config" ,pkg-config) + ("wayland-protocols" ,wayland-protocols))) (inputs `(("curl" ,curl) ("giflib" ,giflib) @@ -110,8 +111,7 @@ ("libwebp" ,libwebp) ("openjpeg" ,openjpeg) ("poppler" ,poppler) - ("util-linux" ,util-linux "lib") - ("wayland-protocols" ,wayland-protocols))) + ("util-linux" ,util-linux "lib"))) (propagated-inputs ;; All these inputs are in package config files in section ;; Requires.private. @@ -353,7 +353,8 @@ Libraries with some extra bells and whistles.") #t)))))) (native-inputs `(("gettext" ,gettext-minimal) - ("pkg-config" ,pkg-config))) + ("pkg-config" ,pkg-config) + ("wayland-protocols" ,wayland-protocols))) (inputs `(("alsa-lib" ,alsa-lib) ("bc" ,bc) @@ -371,7 +372,6 @@ Libraries with some extra bells and whistles.") (propagated-inputs `(("efl" ,efl) ("libxkbcommon" ,libxkbcommon) - ("wayland-protocols" ,wayland-protocols) ;; Default font that applications such as IceCat require. ("font-dejavu" ,font-dejavu))) diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm index 737f47f20f..f1f018b292 100644 --- a/gnu/packages/fcitx5.scm +++ b/gnu/packages/fcitx5.scm @@ -126,7 +126,6 @@ client.") ("pango" ,pango) ("unicode-cldr-common" ,unicode-cldr-common) ("wayland" ,wayland) - ("wayland-protocols" ,wayland-protocols) ("xcb-imdkit" ,xcb-imdkit) ("xcb-util" ,xcb-util) ("xcb-util-keysyms" ,xcb-util-keysyms) @@ -135,7 +134,8 @@ client.") (native-inputs `(("gcc" ,gcc-9) ; for #include ("extra-cmake-modules" ,extra-cmake-modules) - ("pkg-config" ,pkg-config))) + ("pkg-config" ,pkg-config) + ("wayland-protocols" ,wayland-protocols))) (native-search-paths (list (search-path-specification (variable "FCITX_ADDON_DIRS") diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 85d9697460..a8fd24e807 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -1083,6 +1083,7 @@ protocol either in Wayland core, or some other protocol in wayland-protocols.") (native-inputs `(("mscgen" ,mscgen) ("pkg-config" ,pkg-config) + ("wayland-protocols" ,wayland-protocols) ("xorg-server" ,xorg-server))) (inputs `(("cairo" ,cairo-xcb) @@ -1111,7 +1112,6 @@ protocol either in Wayland core, or some other protocol in wayland-protocols.") ("linux-pam" ,linux-pam) ("pango" ,pango) ("pipewire" ,pipewire) - ("wayland-protocols" ,wayland-protocols) ("xorg-server-xwayland" ,xorg-server-xwayland))) (propagated-inputs `(("libxkbcommon" ,libxkbcommon) @@ -1193,11 +1193,11 @@ multiplexer to the KMS/DRM Linux kernel devices.") (delete 'configure)))) (native-inputs `(("pkg-config" ,pkg-config) - ("scdoc" ,scdoc))) + ("scdoc" ,scdoc) + ("wayland-protocols" ,wayland-protocols))) (inputs `(("libxkbcommon" ,libxkbcommon) - ("wayland" ,wayland) - ("wayland-protocols" ,wayland-protocols))) + ("wayland" ,wayland))) (home-page "https://git.sr.ht/~sircmpwn/wev") (synopsis "Wayland event viewer") (description "Wev is a tool that opens a window, printing all events @@ -2454,14 +2454,14 @@ interfaces.") "-Dsd-bus-provider=libelogind"))) (native-inputs `(("cmake" ,cmake) - ("pkg-config" ,pkg-config))) + ("pkg-config" ,pkg-config) + ("wayland-protocols" ,wayland-protocols))) (inputs `(("elogind" ,elogind) ("iniparser" ,iniparser) ("pipewire" ,pipewire-0.3) ("inih" ,libinih) - ("wayland" ,wayland) - ("wayland-protocols" ,wayland-protocols))) + ("wayland" ,wayland))) (home-page "https://github.com/emersion/xdg-desktop-portal-wlr") (synopsis "@code{xdg-desktop-portal} backend for wlroots") (description diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 769389e370..5cf2866c2a 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -279,8 +279,7 @@ also known as DXTn or DXTC) for Mesa.") `(("llvm" ,llvm-11))) (_ `())) - ("wayland" ,wayland) - ("wayland-protocols" ,wayland-protocols))) + ("wayland" ,wayland))) (native-inputs `(("bison" ,bison) ("flex" ,flex) @@ -293,6 +292,7 @@ also known as DXTn or DXTC) for Mesa.") ("pkg-config" ,pkg-config) ("python" ,python-wrapper) ("python-mako" ,python-mako) + ("wayland-protocols" ,wayland-protocols) ("which" ,(@ (gnu packages base) which)))) (outputs '("out" "bin")) (arguments @@ -1118,7 +1118,8 @@ is written in a way that can be used for any general C# application.") (("libGLESv2.so") (string-append mesa "/lib/libGLESv2.so"))) #t)))))) (native-inputs - `(("pkg-config" ,pkg-config))) + `(("pkg-config" ,pkg-config) + ("wayland-protocols" ,wayland-protocols))) (inputs `(("eudev" ,eudev) ("libdrm" ,libdrm) @@ -1127,8 +1128,7 @@ is written in a way that can be used for any general C# application.") ("libx11" ,libx11) ("libxcb" ,libxcb) ("mesa" ,mesa) - ("wayland" ,wayland) - ("wayland-protocols" ,wayland-protocols))) + ("wayland" ,wayland))) (home-page "https://github.com/glmark2/glmark2") (synopsis "OpenGL 2.0 and OpenGL ES 2.0 benchmark") (description diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 2dd64d7c4c..527fc1d774 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -1980,11 +1980,11 @@ identical visual appearance.") (base32 "1l4gwvvc0zvg5b6f6w92xjhmwj7cg9hlgrf43lc7ygaz8dh6cmzg")))) (build-system meson-build-system) (native-inputs `(("pkg-config" ,pkg-config) - ("scdoc" ,scdoc))) + ("scdoc" ,scdoc) + ("wayland-protocols" ,wayland-protocols))) (inputs `(("cairo" ,cairo) ("libjpeg-turbo" ,libjpeg-turbo) - ("wayland" ,wayland) - ("wayland-protocols" ,wayland-protocols))) + ("wayland" ,wayland))) (home-page "https://github.com/emersion/grim") (synopsis "Create screenshots from a Wayland compositor") (description "grim can create screenshots from a Wayland compositor.") @@ -2007,12 +2007,12 @@ identical visual appearance.") (build-system meson-build-system) (native-inputs `(("pkg-config" ,pkg-config) - ("scdoc" ,scdoc))) + ("scdoc" ,scdoc) + ("wayland-protocols" ,wayland-protocols))) (inputs `(("cairo" ,cairo) ("libxkbcommon" ,libxkbcommon) - ("wayland" ,wayland) - ("wayland-protocols" ,wayland-protocols))) + ("wayland" ,wayland))) (home-page "https://github.com/emersion/slurp") (synopsis "Select a region in a Wayland compositor") (description "Slurp can select a region in a Wayland compositor and print it diff --git a/gnu/packages/julia-jll.scm b/gnu/packages/julia-jll.scm index d18971ad48..1ad414ef34 100644 --- a/gnu/packages/julia-jll.scm +++ b/gnu/packages/julia-jll.scm @@ -1600,7 +1600,7 @@ build tree Yggdrasil.") (string-append "\"" (assoc-ref inputs "wayland-protocols") "\"")))) ;; There's a Julia file for each platform, override them all (find-files "src/wrappers/" "\\.jl$"))))))) - (inputs + (native-inputs `(("wayland-protocols" ,wayland-protocols))) (propagated-inputs `(("julia-jllwrappers" ,julia-jllwrappers) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 83bf7bd95a..bfd7631080 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -1077,12 +1077,12 @@ integration with a custom editor as well as a ready-to-use (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) - ("pkg-config" ,pkg-config))) + ("pkg-config" ,pkg-config) + ("wayland-protocols" ,wayland-protocols))) (inputs `(("qtbase" ,qtbase-5) ("qtwayland" ,qtwayland) - ("wayland" ,wayland) - ("wayland-protocols" ,wayland-protocols))) + ("wayland" ,wayland))) (arguments `(#:tests? #f ; FIXME tests require weston to run ; weston requires wayland flags in mesa diff --git a/gnu/packages/kodi.scm b/gnu/packages/kodi.scm index 0ed5d829fb..0212e93952 100644 --- a/gnu/packages/kodi.scm +++ b/gnu/packages/kodi.scm @@ -474,11 +474,13 @@ plug-in system.") `(append '("-DCORE_PLATFORM_NAME=wayland" "-DWAYLAND_RENDER_SYSTEM=gl") ,flags)))) + (native-inputs + `(("waylandp-protocols" ,wayland-protocols) + ,@(package-native-inputs kodi))) (inputs `(("libinput" ,libinput) ("libxkbcommon" ,libxkbcommon) ("waylandpp" ,waylandpp) - ("waylandp-protocols" ,wayland-protocols) ,@(package-inputs kodi))) (synopsis "Kodi with Wayland rendering backend"))) diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm index 83838b5689..79dad2a60a 100644 --- a/gnu/packages/language.scm +++ b/gnu/packages/language.scm @@ -176,6 +176,7 @@ ("libtool" ,libtool) ("perl" ,perl) ("pkg-config" ,pkg-config) + ("wayland-protocols" ,wayland-protocols) ("which" ,which))) (inputs `(("anthy" ,anthy) @@ -189,7 +190,6 @@ ("rime" ,librime) ("rsvg" ,librsvg) ("wayland" ,wayland) - ("wayland-protocols" ,wayland-protocols) ("x11" ,libx11) ("xkbcommon" ,libxkbcommon) ("xklavier" ,libxklavier))) diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index f2afe763c5..90874a6d67 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -138,6 +138,8 @@ joystick, and graphics hardware.") (string-append "LDFLAGS=-Wl,-rpath," (assoc-ref %build-inputs "eudev") "/lib") ,flags)))) + (native-inputs + `(("wayland-protocols" ,wayland-protocols))) (inputs ;; SDL2 needs to be built with ibus support otherwise some systems ;; experience a bug where input events are doubled. @@ -150,8 +152,7 @@ joystick, and graphics hardware.") ("ibus" ,ibus) ("libxkbcommon" ,libxkbcommon) ("libxcursor" ,libxcursor) ; enables X11 cursor support - ("wayland" ,wayland) - ("wayland-protocols" ,wayland-protocols)) + ("wayland" ,wayland)) (package-inputs sdl))) (license bsd-3))) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index be9df8cc65..57fb5e0fee 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1822,7 +1822,8 @@ videoformats depend on the configuration flags of ffmpeg.") `(("flex" ,flex) ("bison" ,bison) ("gettext" ,gettext-minimal) - ("pkg-config" ,pkg-config))) + ("pkg-config" ,pkg-config) + ("wayland-protocols" ,wayland-protocols))) ;; FIXME: Add optional inputs once available. (inputs `(("alsa-lib" ,alsa-lib) @@ -1897,7 +1898,6 @@ videoformats depend on the configuration flags of ffmpeg.") ("twolame" ,twolame) ("unzip" ,unzip) ("wayland" ,wayland) - ("wayland-protocols" ,wayland-protocols) ("x265" ,x265) ("xcb-util-keysyms" ,xcb-util-keysyms))) (arguments @@ -2065,7 +2065,8 @@ SVCD, DVD, 3ivx, DivX 3/4/5, WMV and H.264 movies.") (native-inputs `(("perl" ,perl) ; for zsh completion file ("pkg-config" ,pkg-config) - ("python-docutils" ,python-docutils))) + ("python-docutils" ,python-docutils) + ("wayland-protocols" ,wayland-protocols))) ;; Missing features: libguess, V4L2 (inputs `(("alsa-lib" ,alsa-lib) @@ -2102,7 +2103,6 @@ SVCD, DVD, 3ivx, DivX 3/4/5, WMV and H.264 movies.") ("vulkan-loader" ,vulkan-loader) ("waf" ,python-waf) ("wayland" ,wayland) - ("wayland-protocols" ,wayland-protocols) ("libxkbcommon" ,libxkbcommon) ("youtube-dl" ,youtube-dl) ("zlib" ,zlib))) @@ -3215,7 +3215,8 @@ be used for realtime video capture via Linux-specific APIs.") (files '("share/obs/obs-plugins"))))) (native-inputs `(("cmocka" ,cmocka) - ("pkg-config" ,pkg-config))) + ("pkg-config" ,pkg-config) + ("wayland-protocols" ,wayland-protocols))) (inputs `(("alsa-lib" ,alsa-lib) ("curl" ,curl) @@ -3238,7 +3239,6 @@ be used for realtime video capture via Linux-specific APIs.") ("speexdsp" ,speexdsp) ("v4l-utils" ,v4l-utils) ("wayland" ,wayland) - ("wayland-protocols" ,wayland-protocols) ("zlib" ,zlib))) (synopsis "Live streaming software") (description "Open Broadcaster Software provides a graphical interface for @@ -3333,12 +3333,12 @@ programs on your current machine or on other machines.") "1faiq2gdb7qis3m1hilm4pz8lkmkab75vzm608dbiazahhybf96p")))) (build-system meson-build-system) (native-inputs - `(("pkg-config" ,pkg-config))) + `(("pkg-config" ,pkg-config) + ("wayland-protocols" ,wayland-protocols))) (propagated-inputs `() ) (inputs `(("obs" ,obs) ("libx11" ,libx11 "out") - ("wayland" ,wayland) - ("wayland-protocols" ,wayland-protocols))) + ("wayland" ,wayland))) (home-page "https://hg.sr.ht/~scoopta/wlrobs") (synopsis "OBS plugin for Wayland (wlroots) screen capture") (description @@ -4789,11 +4789,11 @@ speed and correctness.") "01qbcgfl3g9kfwn1jf1z9pdj3bvf5lmg71d1vwkcllc2az24bjqp")))) (build-system meson-build-system) (native-inputs `(("libdrm" ,libdrm) - ("pkg-config" ,pkg-config))) + ("pkg-config" ,pkg-config) + ("wayland-protocols" ,wayland-protocols))) (inputs `(("ffmpeg" ,ffmpeg) ("pulseaudio" ,pulseaudio) - ("wayland" ,wayland) - ("wayland-protocols" ,wayland-protocols))) + ("wayland" ,wayland))) (home-page "https://github.com/atomnuker/wlstream") (synopsis "Screen capture tool for Wayland sessions") (description "Wlstream is a screen capture tool for recording audio and @@ -5165,12 +5165,12 @@ can also directly record to WebM or MP4 if you prefer.") "1cw6kpcbl33wh95pvy32xrsrm6kkk1awccr3phyh885xjs3b3iim")))) (build-system meson-build-system) (native-inputs - `(("pkg-config" ,pkg-config))) + `(("pkg-config" ,pkg-config) + ("wayland-protocols" ,wayland-protocols))) (inputs `(("ffmpeg" ,ffmpeg) ("pulseaudio" ,pulseaudio) ("wayland" ,wayland) - ("wayland-protocols" ,wayland-protocols) ("libx264" ,libx264))) (home-page "https://github.com/ammen99/wf-recorder") (synopsis "Screen recorder for wlroots-based compositors") diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 66440e5008..fa8fe391df 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1452,12 +1452,12 @@ functionality to display information about the most commonly used services.") ("mesa" ,mesa) ("pixman" ,pixman) ("wayland" ,wayland) - ("wayland-protocols" ,wayland-protocols) ("xcb-util-errors" ,xcb-util-errors) ("xcb-util-wm" ,xcb-util-wm) ("xorg-server-xwayland" ,xorg-server-xwayland))) (native-inputs - `(("pkg-config" ,pkg-config))) + `(("pkg-config" ,pkg-config) + ("wayland-protocols" ,wayland-protocols))) (home-page "https://github.com/swaywm/wlroots") (synopsis "Pluggable, composable, unopinionated modules for building a Wayland compositor") diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 129c90d22c..ed47f916ac 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -292,11 +292,11 @@ used to further tweak the behaviour of the different profiles.") ("libxinerama" ,libxinerama) ("ncurses" ,ncurses) ("pango" ,pango) - ("wayland" ,wayland) - ("wayland-protocols" ,wayland-protocols))) + ("wayland" ,wayland))) (native-inputs `(("doxygen" ,doxygen) - ("pkg-config" ,pkg-config))) + ("pkg-config" ,pkg-config) + ("wayland-protocols" ,wayland-protocols))) (home-page "https://github.com/Cloudef/bemenu") (synopsis "Dynamic menu library and client program inspired by dmenu") (description @@ -437,12 +437,12 @@ avoiding password prompts when X11 forwarding has already been setup.") ("libxcb" ,libxcb) ("libxml2" ,libxml2) ("wayland" ,wayland) - ("wayland-protocols" ,wayland-protocols) ("xkeyboard-config" ,xkeyboard-config))) (native-inputs `(("bison" ,bison) ("doxygen" ,doxygen) - ("pkg-config" ,pkg-config))) + ("pkg-config" ,pkg-config) + ("wayland-protocols" ,wayland-protocols))) (arguments `(#:configure-flags (list (string-append "-Dxkb-config-root=" @@ -1106,11 +1106,11 @@ transparent text on your screen.") (build-system meson-build-system) (native-inputs `(("pkg-config" ,pkg-config) - ("scdoc" ,scdoc))) + ("scdoc" ,scdoc) + ("wayland-protocols" ,wayland-protocols))) (inputs `(("libseccomp" ,libseccomp) - ("wayland" ,wayland) - ("wayland-protocols" ,wayland-protocols))) + ("wayland" ,wayland))) (home-page "https://github.com/francma/wob") (synopsis "Lightweight overlay bar for Wayland") (description @@ -2387,11 +2387,11 @@ binary to setuid-binaries: (string-append "\"" (assoc-ref inputs "xdg-utils") "/bin/xdg-mime\"")))))))) (native-inputs - `(("pkg-config" ,pkg-config))) + `(("pkg-config" ,pkg-config) + ("wayland-protocols" ,wayland-protocols))) (inputs `(("coreutils" ,coreutils) ("wayland" ,wayland) - ("wayland-protocols" ,wayland-protocols) ("xdg-utils" ,xdg-utils))) (home-page "https://github.com/bugaevc/wl-clipboard") (synopsis "Command-line copy/paste utilities for Wayland") diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 95d3442d36..9165476877 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -5525,8 +5525,10 @@ draggable titlebars and borders.") (name "xorg-server-xwayland") (inputs `(("wayland" ,wayland) - ("wayland-protocols" ,wayland-protocols) ,@(package-inputs xorg-server))) + (native-inputs + `(("wayland-protocols" ,wayland-protocols) + ,@(package-native-inputs xorg-server))) (arguments (substitute-keyword-arguments (package-arguments xorg-server) ((#:configure-flags flags) -- 2.33.0