[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
23/25: gnu: shaderc: Use more standard keys.
From: |
Tobias Geerinckx-Rice |
Subject: |
23/25: gnu: shaderc: Use more standard keys. |
Date: |
Sat, 17 Mar 2018 11:39:38 -0400 (EDT) |
nckx pushed a commit to branch master
in repository guix.
commit 9bc0591bc11190ac49c8ea3cf44c4903c924f6c7
Author: Tobias Geerinckx-Rice <address@hidden>
Date: Fri Mar 16 16:44:36 2018 +0100
gnu: shaderc: Use more standard keys.
* gnu/packages/vulkan.scm (shaderc)[arguments]: Move cmake options from
the raw INVOKE call to #:build-type and #:configure-flags. Adjust the
‘configure’ phase accordingly.
---
gnu/packages/vulkan.scm | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm
index 6ba9b94..dc73ce3 100644
--- a/gnu/packages/vulkan.scm
+++ b/gnu/packages/vulkan.scm
@@ -225,11 +225,18 @@ and the ICD.")
"0b41inb1czxv3mciip0lfdxv19ccx2ys31fivfywjn2q8va1gd1f"))))
(build-system meson-build-system)
(arguments
- `(#:tests? #f ; tests don't work yet.
+ `(#: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.
#:phases
(modify-phases %standard-phases
(replace 'configure
- (lambda* (#:key outputs #:allow-other-keys)
+ (lambda* (#:key build-type configure-flags #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
;; Remove various lines and touch build-version.inc or
;; configuring won't work.
@@ -247,11 +254,8 @@ and the ICD.")
(substitute* "CMakeLists.txt" ((".*--check.*") ""))
(substitute* "glslc/src/main.cc" ((".*build-version.inc.*")
"\"1\""))
- (invoke "cmake" "-GNinja" "-DCMAKE_BUILD_TYPE=Release"
- "-DSHADERC_SKIP_TESTS=ON"
- "-DCMAKE_INSTALL_LIBDIR=lib"
- (string-append "-DCMAKE_INSTALL_PREFIX="
- out)))))
+ (invoke "cmake" (cons build-type configure-flags))
+ #t)))
(add-after 'unpack 'unpack-sources
(lambda* (#:key inputs #:allow-other-keys)
(let ((spirv-tools-source (assoc-ref %build-inputs
- branch master updated (732a148 -> 3def739), Tobias Geerinckx-Rice, 2018/03/17
- 01/25: gnu: Fix more ‘filesystem’ spellings., Tobias Geerinckx-Rice, 2018/03/17
- 02/25: gnu: perl-date-manip: Update to 6.70., Tobias Geerinckx-Rice, 2018/03/17
- 06/25: gnu: python-bcrypt: Update to 3.1.4., Tobias Geerinckx-Rice, 2018/03/17
- 23/25: gnu: shaderc: Use more standard keys.,
Tobias Geerinckx-Rice <=
- 21/25: gnu: shaderc: Fix formatting., Tobias Geerinckx-Rice, 2018/03/17
- 03/25: gnu: perl-sql-abstract: Update to 1.85., Tobias Geerinckx-Rice, 2018/03/17
- 05/25: gnu: python-entrypoints: Update to 0.2.3., Tobias Geerinckx-Rice, 2018/03/17
- 13/25: gnu: python-kazoo: Update to 2.4.0., Tobias Geerinckx-Rice, 2018/03/17
- 11/25: gnu: python-phonenumbers: Update to 8.9.1., Tobias Geerinckx-Rice, 2018/03/17
- 18/25: gnu: python-nbformat: Update to 4.4.0., Tobias Geerinckx-Rice, 2018/03/17
- 04/25: gnu: Use HTTPS for r-project.org home pages., Tobias Geerinckx-Rice, 2018/03/17
- 22/25: gnu: shaderc: Use standard versioning scheme., Tobias Geerinckx-Rice, 2018/03/17
- 16/25: gnu: python-ptyprocess: Update to 0.5.2., Tobias Geerinckx-Rice, 2018/03/17
- 09/25: gnu: python-jsonschema: Update to 2.6.0., Tobias Geerinckx-Rice, 2018/03/17