nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "gnu: shaderc: Use more standard keys." 

This reverts commit 9bc0591bc1.
This commit broke 'shaderc'.
This commit is contained in:
Rutger Helling 2018-03-17 21:55:24 +01:00
parent fb6f35ba1d
commit 308b17f676
No known key found for this signature in database
GPG Key ID: F3A727DB44FCCA36
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gnu/packages/vulkan.scm
View File

@ -225,18 +225,11 @@ and the ICD.")
"0b41inb1czxv3mciip0lfdxv19ccx2ys31fivfywjn2q8va1gd1f")))) "0b41inb1czxv3mciip0lfdxv19ccx2ys31fivfywjn2q8va1gd1f"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
`(#:build-type "Release" `(#:tests? #f ; tests don't work yet.
#:configure-flags
(list "-GNinja"
"-DSHADERC_SKIP_TESTS=ON"
"-DCMAKE_INSTALL_LIBDIR=lib"
(string-append "-DCMAKE_INSTALL_PREFIX="
(assoc-ref %outputs "out")))
#:tests? #f ; tests don't work yet.
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(replace 'configure (replace 'configure
(lambda* (#:key build-type configure-flags #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))) (let ((out (assoc-ref outputs "out")))
;; Remove various lines and touch build-version.inc or ;; Remove various lines and touch build-version.inc or
;; configuring won't work. ;; configuring won't work.
@ -254,8 +247,11 @@ and the ICD.")
(substitute* "CMakeLists.txt" ((".*--check.*") "")) (substitute* "CMakeLists.txt" ((".*--check.*") ""))
(substitute* "glslc/src/main.cc" ((".*build-version.inc.*") (substitute* "glslc/src/main.cc" ((".*build-version.inc.*")
"\"1\"")) "\"1\""))
(invoke "cmake" (cons build-type configure-flags)) (invoke "cmake" "-GNinja" "-DCMAKE_BUILD_TYPE=Release"
#t))) "-DSHADERC_SKIP_TESTS=ON"
"-DCMAKE_INSTALL_LIBDIR=lib"
(string-append "-DCMAKE_INSTALL_PREFIX="
out)))))
(add-after 'unpack 'unpack-sources (add-after 'unpack 'unpack-sources
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(let ((spirv-tools-source (assoc-ref %build-inputs (let ((spirv-tools-source (assoc-ref %build-inputs