bartronx7/guix
1
0
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2026-01-25 20:15:25 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

guix: ocaml: Identify OCaml and Dune build systems by name.

Browse source 
* guix/build-system/ocaml.scm (package-with-explicit-ocaml):
Identify OCaml and Dune build systems using `build-system-name`.

Change-Id: I406ff96ec4ccb018eabc02cdab843faa0b4a77ab
Signed-off-by: Julien Lepiller <julien@lepiller.eu>
This commit is contained in:
Jason Conroy 2025-11-29 07:05:29 -05:00 • committed by Julien Lepiller
parent cc5b9ebb8e
commit ccd13ed9a9
No known key found for this signature in database
GPG key ID: 53D457B2D636EE82
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
guix/build-system/ocaml.scm
View file

@ -155,6 +155,12 @@ pre-defined variants."
variant-property))
(const #f)))
(define (has-ocaml-build-system? p)
(eq? 'ocaml (build-system-name (package-build-system p))))
(define (has-dune-build-system? p)
(eq? 'dune (build-system-name (package-build-system p))))
(define (transform p)
(cond
;; If VARIANT-PROPERTY is present, use that.
@ -162,8 +168,7 @@ pre-defined variants."
=> force)
;; Otherwise build the new package object graph.
((or (eq? (package-build-system p) ocaml-build-system)
(eq? (package-build-system p) (default-dune-build-system)))
((or (has-ocaml-build-system? p) (has-dune-build-system? p))
(package
(inherit p)
(location (package-location p))
@ -180,15 +185,13 @@ pre-defined variants."
(ensure-keyword-arguments (package-arguments p)
`(#:ocaml ,ocaml
#:findlib ,findlib
,@(if (eq? (package-build-system p)
(default-dune-build-system))
,@(if (has-dune-build-system? p)
`(#:dune ,dune)
'())))))))
(else p)))
(define (cut? p)
(or (not (or (eq? (package-build-system p) ocaml-build-system)
(eq? (package-build-system p) (default-dune-build-system))))
(or (not (or (has-ocaml-build-system? p) (has-dune-build-system? p)))
(package-variant p)))
(package-mapping transform cut?))