ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-11 21:59:08 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: shaderc: Use more standard keys.

Browse source 
* 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.
This commit is contained in:
Tobias Geerinckx-Rice 2018-03-16 16:44:36 +01:00
parent 8696fbbad1
commit 9bc0591bc1
No known key found for this signature in database
GPG key ID: 0DB0FF884F556D79
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
gnu/packages/vulkan.scm
View file

@ -225,11 +225,18 @@ (define-public shaderc
"0b41inb1czxv3mciip0lfdxv19ccx2ys31fivfywjn2q8va1gd1f")))) "0b41inb1czxv3mciip0lfdxv19ccx2ys31fivfywjn2q8va1gd1f"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (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 #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(replace 'configure (replace 'configure
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key build-type configure-flags #: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.
@ -247,11 +254,8 @@ (define-public shaderc
(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" "-GNinja" "-DCMAKE_BUILD_TYPE=Release" (invoke "cmake" (cons build-type configure-flags))
"-DSHADERC_SKIP_TESTS=ON" #t)))
"-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