From c69959f0545e5383a8caab53944c86abc5dfeeed Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 17 Jun 2019 17:24:24 +0200 Subject: gnu: Replace uses of 'cmake' with 'cmake-minimal'. This follows up commit 2f33a7321e5e37d37f57c229c8079cb4ffd10834 which introduced a new CMAKE-MINIMAL variant for use in package inputs. * gnu/packages/databases.scm (python-pyarrow)[native-inputs]: Replace CMAKE with CMAKE-MINIMAL. * gnu/packages/emacs-xyz.scm (emacs-scel)[native-inputs]: Likewise. * gnu/packages/firmware.scm (ath9k-htc-firmware)[native-inputs]: Likewise. * gnu/packages/games.scm (0ad, the-butterfly-effect)[native-inputs]: Likewise. * gnu/packages/gnome.scm (deja-dup)[native-inputs]: Likewise. * gnu/packages/ibus.scm (ibus-rime)[native-inputs]: Likewise. * gnu/packages/rust.scm (rust-1.19)[native-inputs]: Likewise. * gnu/packages/simulation.scm (fenics)[native-inputs]: Likewise. * gnu/packages/squirrel.scm (squirrel)[native-inputs]: Likewise. * gnu/packages/video.scm (handbrake)[native-inputs]: Likewise. * gnu/packages/virtualization.scm (xen)[native-inputs]: Likewise. * gnu/packages/vulkan.scm (shaderc)[native-inputs]: Likewise. --- gnu/packages/vulkan.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/vulkan.scm') diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 6b151f0a31..6ae9ba9b87 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -326,7 +326,7 @@ API.") `(("googletest" ,googletest) ("python" ,python))) (native-inputs - `(("cmake" ,cmake) + `(("cmake" ,cmake-minimal) ("glslang-source" ,(package-source glslang)) ("pkg-config" ,pkg-config) ("spirv-headers-source" ,(package-source spirv-headers)) -- cgit v1.2.3 From 9f74ec98d34465770faec5a32685aaaee913f0bf Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 2 Jul 2019 23:08:12 +0200 Subject: gnu: spirv-tools: Remove GCC7 input. * gnu/packages/vulkan.scm (spirv-tools)[native-inputs]: Remove GCC-7. [arguments]: Remove <#:phases>. --- gnu/packages/vulkan.scm | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'gnu/packages/vulkan.scm') diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index c16535f704..160d2615ff 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -32,7 +32,6 @@ #:use-module (gnu packages check) #:use-module (gnu packages cmake) #:use-module (gnu packages freedesktop) - #:use-module (gnu packages gcc) #:use-module (gnu packages gettext) #:use-module (gnu packages gl) #:use-module (gnu packages pkg-config) @@ -96,18 +95,10 @@ and for the GLSL.std.450 extended instruction set. (build-system cmake-build-system) (arguments `(#:tests? #f ; FIXME: Tests fail. - #:phases - (modify-phases %standard-phases - (add-before 'configure 'fixgcc7 - (lambda _ - (unsetenv "C_INCLUDE_PATH") - (unsetenv "CPLUS_INCLUDE_PATH") - #t))) #:configure-flags (list (string-append "-DSPIRV-Headers_SOURCE_DIR=" (assoc-ref %build-inputs "spirv-headers"))))) (inputs `(("spirv-headers" ,spirv-headers))) - (native-inputs `(("gcc" ,gcc-7) - ("pkg-config" ,pkg-config) + (native-inputs `(("pkg-config" ,pkg-config) ("python" ,python))) (home-page "https://github.com/KhronosGroup/SPIRV-Tools") (synopsis "API and commands for processing SPIR-V modules") -- cgit v1.2.3 From 3b14974706913d283bdeb6d62e660cb5702125e0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 11 Sep 2019 20:54:34 +0200 Subject: gnu: glslang: Use GIT-FILE-NAME. * gnu/packages/vulkan.scm (glslang)[source]: Use GIT-FILE-NAME. --- gnu/packages/vulkan.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/vulkan.scm') diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 0b3d476fa2..511831b9bd 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017, 2018, 2019 Rutger Helling -;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018 Efraim Flashner ;;; ;;; This file is part of GNU Guix. @@ -53,7 +53,7 @@ (sha256 (base32 "0m56smanfcczjfif4yfcqhjj4d4sc088kwg6dgia8fwdsjavdm4d")) - (file-name (string-append name "-" version "-checkout")))) + (file-name (git-file-name name version)))) (build-system cmake-build-system) (arguments `(#:tests? #f ;; No tests -- cgit v1.2.3 From aa1c7b4914fc7aeb31b2953388d3041dbf0b0ac6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 25 Sep 2019 01:13:08 +0200 Subject: gnu: spirv-tools: Update to 2019.2. * gnu/packages/vulkan.scm (spirv-tools): Update to 2019.2. --- gnu/packages/vulkan.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu/packages/vulkan.scm') diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 511831b9bd..f12062ac2f 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -82,7 +82,7 @@ and for the GLSL.std.450 extended instruction set. (define-public spirv-tools (package (name "spirv-tools") - (version "2019.1") + (version "2019.2") (source (origin (method git-fetch) @@ -90,8 +90,7 @@ and for the GLSL.std.450 extended instruction set. (url "https://github.com/KhronosGroup/SPIRV-Tools") (commit (string-append "v" version)))) (sha256 - (base32 - "0vddjzhkrhrm3l3i57nxmq2smv3r1s0ka5ff2kziaahr4hqb479r")) + (base32 "0zwz6qg8g8165h7cw52agryjrdb29gbmsbziw3pwiddfkyma8vvg")) (file-name (string-append name "-" version "-checkout")))) (build-system cmake-build-system) (arguments -- cgit v1.2.3 From d7a7d255c4566652a79210ca1d6b9b1d8fe9f9b7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 25 Sep 2019 01:21:38 +0200 Subject: gnu: spirv-tools: Use GIT-FILE-NAME. * gnu/packages/vulkan.scm (spirv-tools)[source]: Use GIT-FILE-NAME. --- gnu/packages/vulkan.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/vulkan.scm') diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index f12062ac2f..9260a2cf9f 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -91,7 +91,7 @@ and for the GLSL.std.450 extended instruction set. (commit (string-append "v" version)))) (sha256 (base32 "0zwz6qg8g8165h7cw52agryjrdb29gbmsbziw3pwiddfkyma8vvg")) - (file-name (string-append name "-" version "-checkout")))) + (file-name (git-file-name name version)))) (build-system cmake-build-system) (arguments `(#:tests? #f ; FIXME: Tests fail. -- cgit v1.2.3