[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
21/25: gnu: shaderc: Fix formatting.
From: |
Tobias Geerinckx-Rice |
Subject: |
21/25: gnu: shaderc: Fix formatting. |
Date: |
Sat, 17 Mar 2018 11:39:37 -0400 (EDT) |
nckx pushed a commit to branch master
in repository guix.
commit 49c4c4de8575821b0ba08b5c980b996577bcb9ec
Author: Tobias Geerinckx-Rice <address@hidden>
Date: Fri Mar 16 16:33:16 2018 +0100
gnu: shaderc: Fix formatting.
* gnu/packages/vulkan.scm (shaderc): Use conventional indentation.
[native-inputs]: Move unquotes to their operands.
---
gnu/packages/vulkan.scm | 142 ++++++++++++++++++++++++------------------------
1 file changed, 72 insertions(+), 70 deletions(-)
diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm
index 478de6a..2daa857 100644
--- a/gnu/packages/vulkan.scm
+++ b/gnu/packages/vulkan.scm
@@ -210,74 +210,76 @@ and the ICD.")
(let ((commit "773ec22d49f40b7161820f29d953be4a7e40190d")
(revision "1"))
(package
- (name "shaderc")
- (version (string-append "0.0-" revision "." (string-take commit 9)))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/google/shaderc")
- (commit commit)))
- (file-name (string-append name "-" version ".tar.gz"))
- (sha256
- (base32
- "0b41inb1czxv3mciip0lfdxv19ccx2ys31fivfywjn2q8va1gd1f"))))
- (build-system meson-build-system)
- (arguments
- `(#:tests? #f ;; Tests don't work yet.
- #:phases
- (modify-phases %standard-phases
- (replace 'configure
- (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.
- (invoke "touch" "glslc/src/build-version.inc")
- (substitute* "CMakeLists.txt" (("..PYTHON_EXE..*") ""))
- (substitute* "CMakeLists.txt"
- ((".*update_build_version.py..*") ""))
- (substitute* "CMakeLists.txt"
- ((".*add_custom_target.build-version.*") ""))
- (substitute* "CMakeLists.txt"
-
((".*spirv-tools_SOURCE_DIR.*glslang_SOURCE_DIR.*")
- ""))
- (substitute* "CMakeLists.txt"
- ((".*Update build-version.inc.*") ""))
- (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)))))
- (add-after 'unpack 'unpack-sources
- (lambda* (#:key inputs #:allow-other-keys)
- (let ((spirv-tools-source (assoc-ref %build-inputs
-
"spirv-tools-source"))
- (spirv-headers-source (assoc-ref %build-inputs
-
"spirv-headers-source"))
- (glslang-source (assoc-ref %build-inputs
- "glslang-source")))
- (mkdir-p "third-party/spirv-tools")
- (copy-recursively spirv-tools-source
- "third_party/spirv-tools")
- (mkdir-p
"third-party/spirv-tools/external/spirv-headers")
- (copy-recursively spirv-headers-source
- (string-append
"third_party/spirv-tools"
-
"/external/spirv-headers"))
- (mkdir-p "third-party/glslang")
- (copy-recursively glslang-source
- "third_party/glslang")
- #t))))))
- (inputs `(("python" ,python)))
- (native-inputs `(("cmake" ,cmake)
- ("glslang-source", (package-source glslang))
- ("pkg-config", pkg-config)
- ("spirv-headers-source", (package-source spirv-headers))
- ("spirv-tools-source", (package-source spirv-tools))))
- (home-page "https://github.com/google/shaderc")
- (synopsis "Tools for shader compilation")
- (description "Shaderc is a collection of tools, libraries and tests for
+ (name "shaderc")
+ (version (string-append "0.0-" revision "." (string-take commit 9)))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/google/shaderc")
+ (commit commit)))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "0b41inb1czxv3mciip0lfdxv19ccx2ys31fivfywjn2q8va1gd1f"))))
+ (build-system meson-build-system)
+ (arguments
+ `(#:tests? #f ; tests don't work yet.
+ #:phases
+ (modify-phases %standard-phases
+ (replace 'configure
+ (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.
+ (invoke "touch" "glslc/src/build-version.inc")
+ (substitute* "CMakeLists.txt" (("..PYTHON_EXE..*") ""))
+ (substitute* "CMakeLists.txt"
+ ((".*update_build_version.py..*") ""))
+ (substitute* "CMakeLists.txt"
+ ((".*add_custom_target.build-version.*") ""))
+ (substitute* "CMakeLists.txt"
+ ((".*spirv-tools_SOURCE_DIR.*glslang_SOURCE_DIR.*")
+ ""))
+ (substitute* "CMakeLists.txt"
+ ((".*Update build-version.inc.*") ""))
+ (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)))))
+ (add-after 'unpack 'unpack-sources
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((spirv-tools-source (assoc-ref %build-inputs
+ "spirv-tools-source"))
+ (spirv-headers-source (assoc-ref %build-inputs
+ "spirv-headers-source"))
+ (glslang-source (assoc-ref %build-inputs
+ "glslang-source")))
+ (mkdir-p "third-party/spirv-tools")
+ (copy-recursively spirv-tools-source
+ "third_party/spirv-tools")
+ (mkdir-p "third-party/spirv-tools/external/spirv-headers")
+ (copy-recursively spirv-headers-source
+ (string-append "third_party/spirv-tools"
+ "/external/spirv-headers"))
+ (mkdir-p "third-party/glslang")
+ (copy-recursively glslang-source
+ "third_party/glslang")
+ #t))))))
+ (inputs
+ `(("python" ,python)))
+ (native-inputs
+ `(("cmake" ,cmake)
+ ("glslang-source" ,(package-source glslang))
+ ("pkg-config" ,pkg-config)
+ ("spirv-headers-source" ,(package-source spirv-headers))
+ ("spirv-tools-source" ,(package-source spirv-tools))))
+ (home-page "https://github.com/google/shaderc")
+ (synopsis "Tools for shader compilation")
+ (description "Shaderc is a collection of tools, libraries, and tests for
shader compilation.")
- (license license:asl2.0))))
+ (license license:asl2.0))))
- 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, 2018/03/17
- 21/25: gnu: shaderc: Fix formatting.,
Tobias Geerinckx-Rice <=
- 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
- 17/25: gnu: python-simplejson: Update to 3.13.2., Tobias Geerinckx-Rice, 2018/03/17