TakeV/guix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

gnu: shaderc: Clean up package arguments.

Browse source 
* gnu/packages/vulkan.scm (shaderc)[version]: Remove extra '-'.
[arguments]: Remove extra 'mkdir-p' calls and refer to inputs directly.
This commit is contained in:
Efraim Flashner 2018-03-17 23:08:34 +02:00
parent 308b17f676
commit 5983b78368
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
1 changed files with 7 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
gnu/packages/vulkan.scm
View file

@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2017, 2018 Rutger Helling <rhelling@mykolab.com> ;;; Copyright © 2017, 2018 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -212,7 +213,7 @@ (define-public shaderc
(revision "1")) (revision "1"))
(package (package
(name "shaderc") (name "shaderc")
(version (git-version "0.0.0-" revision commit)) (version (git-version "0.0.0" revision commit))
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -254,22 +255,14 @@ (define-public shaderc
out))))) 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 inputs "spirv-tools-source"))
"spirv-tools-source")) (spirv-headers-source (assoc-ref inputs "spirv-headers-source"))
(spirv-headers-source (assoc-ref %build-inputs (glslang-source (assoc-ref inputs "glslang-source")))
"spirv-headers-source")) (copy-recursively spirv-tools-source "third_party/spirv-tools")
(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 (copy-recursively spirv-headers-source
(string-append "third_party/spirv-tools" (string-append "third_party/spirv-tools"
"/external/spirv-headers")) "/external/spirv-headers"))
(mkdir-p "third-party/glslang") (copy-recursively glslang-source "third_party/glslang")
(copy-recursively glslang-source
"third_party/glslang")
#t)))))) #t))))))
(inputs (inputs
`(("python" ,python))) `(("python" ,python)))