diff mbox series

[bug#60571,v2,2/4] gnu: Add spirv-tools-for-skia.

Message ID 2d100ebb4760a7ff7c8cae0bf07176bbfae77b33.1693140822.git.ngraves@ngraves.fr
State New
Headers show
Series [bug#60571,v2,1/4] gnu: Add spirv-headers-for-skia. | expand

Commit Message

Nicolas Graves Aug. 27, 2023, 12:53 p.m. UTC
* gnu/packages/vulkan.scm (spirv-tools-for-skia): New variable.
---
 gnu/packages/vulkan.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

Comments

Maxim Cournoyer Aug. 28, 2023, 3:29 p.m. UTC | #1
Hello,

Nicolas Graves <ngraves@ngraves.fr> writes:

> * gnu/packages/vulkan.scm (spirv-tools-for-skia): New variable.
> ---
>  gnu/packages/vulkan.scm | 23 +++++++++++++++++++++++
>  1 file changed, 23 insertions(+)
>
> diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm
> index da83417dba..9f02b1d235 100644
> --- a/gnu/packages/vulkan.scm
> +++ b/gnu/packages/vulkan.scm
> @@ -129,6 +129,29 @@ (define-public spirv-tools
>  parser,disassembler, validator, and optimizer for SPIR-V.")
>      (license license:asl2.0)))
>  
> +(define-public spirv-tools-for-skia
> +  (package
> +    (inherit spirv-tools)
> +    (name "spirv-tools-for-skia")
> +    (version %vulkan-sdk-skia-version)
> +    (source
> +     (origin
> +       (method git-fetch)
> +       (uri (git-reference
> +             (url "https://skia.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools.git")

Same line length comment as previously.

> +             (commit version)))
> +       (file-name (git-file-name name version))
> +       (sha256
> +        (base32 "0cp1amgylflh36nw3sy0cy7pf9bhhzykk3vxqwmgnxiryr65nhph"))))
> +    (inputs (list spirv-headers-for-skia))
> +    (native-inputs (list pkg-config python-wrapper))
> +    (arguments
> +     (list
> +      #:configure-flags `(list "-DBUILD_SHARED_LIBS=ON"
> +                               (string-append
> +                                "-DSPIRV-Headers_SOURCE_DIR="
> +                                (assoc-ref %build-inputs "spirv-headers-for-skia")))))))

The configure-flags should use a gexp #~(list ...) in which you can then use
#$(this-package-native-input "spirv-headers-for-skia").
diff mbox series

Patch

diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm
index da83417dba..9f02b1d235 100644
--- a/gnu/packages/vulkan.scm
+++ b/gnu/packages/vulkan.scm
@@ -129,6 +129,29 @@  (define-public spirv-tools
 parser,disassembler, validator, and optimizer for SPIR-V.")
     (license license:asl2.0)))
 
+(define-public spirv-tools-for-skia
+  (package
+    (inherit spirv-tools)
+    (name "spirv-tools-for-skia")
+    (version %vulkan-sdk-skia-version)
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://skia.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools.git")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0cp1amgylflh36nw3sy0cy7pf9bhhzykk3vxqwmgnxiryr65nhph"))))
+    (inputs (list spirv-headers-for-skia))
+    (native-inputs (list pkg-config python-wrapper))
+    (arguments
+     (list
+      #:configure-flags `(list "-DBUILD_SHARED_LIBS=ON"
+                               (string-append
+                                "-DSPIRV-Headers_SOURCE_DIR="
+                                (assoc-ref %build-inputs "spirv-headers-for-skia")))))))
+
 (define-public spirv-cross
   (package
     (name "spirv-cross")