futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gnu: spirv-tools: Remove GCC7 input.

Browse Source 
* gnu/packages/vulkan.scm (spirv-tools)[native-inputs]: Remove GCC-7.
[arguments]: Remove <#:phases>.
This commit is contained in:
Marius Bakke 2019-07-02 23:08:12 +02:00
parent c8f2050ab6
commit 9f74ec98d3
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gnu/packages/vulkan.scm
View File

@ -32,7 +32,6 @@
#:use-module (gnu packages check) #:use-module (gnu packages check)
#:use-module (gnu packages cmake) #:use-module (gnu packages cmake)
#:use-module (gnu packages freedesktop) #:use-module (gnu packages freedesktop)
#:use-module (gnu packages gcc)
#:use-module (gnu packages gettext) #:use-module (gnu packages gettext)
#:use-module (gnu packages gl) #:use-module (gnu packages gl)
#:use-module (gnu packages pkg-config) #:use-module (gnu packages pkg-config)
@ -96,18 +95,10 @@ and for the GLSL.std.450 extended instruction set.
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:tests? #f ; FIXME: Tests fail. `(#: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=" #:configure-flags (list (string-append "-DSPIRV-Headers_SOURCE_DIR="
(assoc-ref %build-inputs "spirv-headers"))))) (assoc-ref %build-inputs "spirv-headers")))))
(inputs `(("spirv-headers" ,spirv-headers))) (inputs `(("spirv-headers" ,spirv-headers)))
(native-inputs `(("gcc" ,gcc-7) (native-inputs `(("pkg-config" ,pkg-config)
("pkg-config" ,pkg-config)
("python" ,python))) ("python" ,python)))
(home-page "https://github.com/KhronosGroup/SPIRV-Tools") (home-page "https://github.com/KhronosGroup/SPIRV-Tools")
(synopsis "API and commands for processing SPIR-V modules") (synopsis "API and commands for processing SPIR-V modules")