[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Revert "gnu: shaderc: Use more standard keys."
From: |
Rutger Helling |
Subject: |
01/01: Revert "gnu: shaderc: Use more standard keys." |
Date: |
Sat, 17 Mar 2018 16:59:41 -0400 (EDT) |
rhelling pushed a commit to branch master
in repository guix.
commit 308b17f676999876bfec12841659cbfa56a652be
Author: Rutger Helling <address@hidden>
Date: Sat Mar 17 21:55:24 2018 +0100
Revert "gnu: shaderc: Use more standard keys."
This reverts commit 9bc0591bc11190ac49c8ea3cf44c4903c924f6c7.
This commit broke 'shaderc'.
---
gnu/packages/vulkan.scm | 18 +++++++-----------
1 file changed, 7 insertions(+), 11 deletions(-)
diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm
index 4d98141..bd0fb9e 100644
--- a/gnu/packages/vulkan.scm
+++ b/gnu/packages/vulkan.scm
@@ -225,18 +225,11 @@ and the ICD.")
"0b41inb1czxv3mciip0lfdxv19ccx2ys31fivfywjn2q8va1gd1f"))))
(build-system meson-build-system)
(arguments
- `(#:build-type "Release"
- #: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.
+ `(#:tests? #f ; tests don't work yet.
#:phases
(modify-phases %standard-phases
(replace 'configure
- (lambda* (#:key build-type configure-flags #:allow-other-keys)
+ (lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
;; Remove various lines and touch build-version.inc or
;; configuring won't work.
@@ -254,8 +247,11 @@ and the ICD.")
(substitute* "CMakeLists.txt" ((".*--check.*") ""))
(substitute* "glslc/src/main.cc" ((".*build-version.inc.*")
"\"1\""))
- (invoke "cmake" (cons build-type configure-flags))
- #t)))
+ (invoke "cmake" "-GNinja" "-DCMAKE_BUILD_TYPE=Release"
+ "-DSHADERC_SKIP_TESTS=ON"
+ "-DCMAKE_INSTALL_LIBDIR=lib"
+ (string-append "-DCMAKE_INSTALL_PREFIX="
+ out)))))
(add-after 'unpack 'unpack-sources
(lambda* (#:key inputs #:allow-other-keys)
(let ((spirv-tools-source (assoc-ref %build-inputs