From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37289) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d8qCD-0004h2-HO for guix-patches@gnu.org; Thu, 11 May 2017 11:40:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d8qCA-0005IX-9d for guix-patches@gnu.org; Thu, 11 May 2017 11:40:05 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:36230) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1d8qCA-0005IS-5s for guix-patches@gnu.org; Thu, 11 May 2017 11:40:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1d8qC9-0003yJ-Rz for guix-patches@gnu.org; Thu, 11 May 2017 11:40:01 -0400 Subject: bug#26880: [PATCH 04/11] gnu: gtk+: Enable wayland backend. Resent-Message-ID: Received: from eggs.gnu.org ([2001:4830:134:3::10]:37005) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d8qBm-0004HY-7B for guix-patches@gnu.org; Thu, 11 May 2017 11:39:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d8qBi-0004b0-UV for guix-patches@gnu.org; Thu, 11 May 2017 11:39:38 -0400 Received: from lb1.openmailbox.org ([5.79.108.160]:33535 helo=mail.openmailbox.org) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1d8qBi-0004ZP-Nv for guix-patches@gnu.org; Thu, 11 May 2017 11:39:34 -0400 From: Kei Kebreau Date: Thu, 11 May 2017 11:30:14 -0400 Message-Id: <20170511153021.14972-4-kei@openmailbox.org> In-Reply-To: <20170511153021.14972-1-kei@openmailbox.org> References: <20170511153021.14972-1-kei@openmailbox.org> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 26880@debbugs.gnu.org * gnu/packages/gtk.scm (gtk+)[propagated-inputs]: Add libxkbcommon, mesa, wayland and wayland-protocols. [arguments]: Add "--enable-wayland-backend" and "--enable-x11-backend" to #:configure-flags. --- gnu/packages/gtk.scm | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 985056b95..9732ee4cc 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -50,6 +50,7 @@ #:use-module (gnu packages docbook) #:use-module (gnu packages enchant) #:use-module (gnu packages fontutils) + #:use-module (gnu packages freedesktop) #:use-module (gnu packages gettext) #:use-module (gnu packages ghostscript) #:use-module (gnu packages gl) @@ -673,8 +674,12 @@ application suites.") ("libxcursor" ,libxcursor) ("libxi" ,libxi) ("libxinerama" ,libxinerama) + ("libxkbcommon" ,libxkbcommon) ("libxdamage" ,libxdamage) - ("pango" ,pango))) + ("mesa" ,mesa) + ("pango" ,pango) + ("wayland" ,wayland) + ("wayland-protocols" ,wayland-protocols))) (inputs `(("libxml2" ,libxml2) ;; XXX: colord depends on mozjs (through polkit), which fails on @@ -700,7 +705,12 @@ application suites.") ;; to "doc". #:configure-flags (list (string-append "--with-html-dir=" (assoc-ref %outputs "doc") - "/share/gtk-doc/html")) + "/share/gtk-doc/html") + ;; The header file is required + ;; by gnome-control-center + "--enable-wayland-backend" + ;; This is necessary to build both backends. + "--enable-x11-backend") #:phases (modify-phases %standard-phases (add-before 'configure 'pre-configure (lambda _ -- 2.13.0