From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48665) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gFHY5-0007Xm-Dz for guix-patches@gnu.org; Wed, 24 Oct 2018 07:42:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gFHY3-0007K6-DH for guix-patches@gnu.org; Wed, 24 Oct 2018 07:42:05 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:34903) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gFHY3-0007Jq-6M for guix-patches@gnu.org; Wed, 24 Oct 2018 07:42:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gFHY3-0006ur-2r for guix-patches@gnu.org; Wed, 24 Oct 2018 07:42:03 -0400 Subject: [bug#33136] [PATCH 3/7] gnu: qt: Add vulkan support. Resent-Message-ID: From: Efraim Flashner Date: Wed, 24 Oct 2018 14:41:30 +0300 Message-Id: <20181024114134.3116-3-efraim@flashner.co.il> In-Reply-To: <20181024112618.2417-1-efraim@flashner.co.il> References: <20181024112618.2417-1-efraim@flashner.co.il> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: 33136@debbugs.gnu.org * gnu/packages/qt.scm (qt, qtbase)[native-inputs]: Add vulkan-headers. (qt@4)[native-inputs]: Don't add vulkan-headers. (qttools)[native-inputs]: Add vulkan-headers. --- gnu/packages/qt.scm | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index dffa8b5cf..143ca45b7 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -64,9 +64,11 @@ #:use-module (gnu packages ruby) #:use-module (gnu packages sdl) #:use-module (gnu packages tls) + #:use-module (gnu packages vulkan) #:use-module (gnu packages xdisorg) #:use-module (gnu packages xorg) - #:use-module (gnu packages xml)) + #:use-module (gnu packages xml) + #:use-module (srfi srfi-1)) (define-public grantlee (package @@ -224,6 +226,7 @@ system, and the core design of Django is reused in Grantlee.") ("pkg-config" ,pkg-config) ("python" ,python-2) ("ruby" ,ruby) + ("vulkan-headers" ,vulkan-headers) ("which" ,(@ (gnu packages base) which)))) (arguments `(#:parallel-build? #f ; Triggers race condition in qtbase module on Hydra. @@ -401,10 +404,16 @@ system, and the core design of Django is reused in Grantlee.") ;; Remove webkit module, which is not built. '(begin (delete-file-recursively "src/3rdparty/webkit") #t)))) - (inputs `(,@(alist-delete "harfbuzz" - (alist-delete "libjpeg" (package-inputs qt))) - ("libjepg" ,libjpeg-8) - ("libsm" ,libsm))) + (inputs + `(,@(fold alist-delete + (package-inputs qt) + '("harfbuzz" "libjepg")) + ("libjepg" ,libjpeg-8) + ("libsm" ,libsm))) + (native-inputs + `(,@(fold alist-delete + (package-native-inputs qt) + '("vulkan-headers")))) ;; Note: there are 37 MiB of examples and a '-exampledir' configure flags, ;; but we can't make them a separate output because "out" and "examples" @@ -560,6 +569,7 @@ system, and the core design of Django is reused in Grantlee.") ("perl" ,perl) ("pkg-config" ,pkg-config) ("python" ,python-2) + ("vulkan-headers" ,vulkan-headers) ("ruby" ,ruby))) (arguments `(#:phases @@ -1283,7 +1293,8 @@ positioning and geolocation plugins."))) ((#:tests? _ #f) #f))) ; TODO: Enable the tests (native-inputs `(("perl" ,perl) - ("qtdeclarative" ,qtdeclarative))) + ("qtdeclarative" ,qtdeclarative) + ("vulkan-headers" ,vulkan-headers))) (inputs `(("mesa" ,mesa) ("qtbase" ,qtbase))) -- 2.19.1