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

build/cmake: Add #:implicit-inputs? and #:implicit-cross-inputs? arguments.

Browse source 
* guix/build-system/cmake.scm (lower) <#:implicit-inputs?>
<#:implicit-cross-inputs?>: New arguments.

Change-Id: I1f077f78f5836ce325827e7ef8d58ba554a8ed4f
Reviewed-by: Greg Hogan <code@greghogan.com>
This commit is contained in:
Maxim Cournoyer 2025-04-29 22:53:59 +09:00
parent 74325f91c9
commit f87204b2b2
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
guix/build-system/cmake.scm
View file

@ -3,6 +3,7 @@
;;; Copyright © 2013 Cyril Roelandt <tipecaml@gmail.com>
;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2025 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -65,12 +66,14 @@
(define* (lower name
#:key source inputs native-inputs outputs system target
(implicit-inputs? #t) (implicit-cross-inputs? #t)
(cmake (default-cmake target))
#:allow-other-keys
#:rest arguments)
"Return a bag for NAME."
(define private-keywords
`(#:cmake #:inputs #:native-inputs
#:implicit-inputs? #:implicit-cross-inputs?
,@(if target '() '(#:target))))
(bag
@ -83,13 +86,15 @@
,@`(("cmake" ,cmake))
,@native-inputs
,@(if target '() inputs)
,@(if target
,@(if (and target implicit-cross-inputs?)
;; Use the standard cross inputs of
;; 'gnu-build-system'.
(standard-cross-packages target 'host)
'())
;; Keep the standard inputs of 'gnu-build-system'.
,@(standard-packages)))
,@(if implicit-inputs?
(standard-packages system)
'())))
(host-inputs (if target inputs '()))
;; The cross-libc is really a target package, but for bootstrapping
@ -97,7 +102,7 @@
;; native package, so it would end up using a "native" variant of
;; 'cross-libc' (built with 'gnu-build'), whereas all the other packages
;; would use a target variant (built with 'gnu-cross-build'.)
(target-inputs (if target
(target-inputs (if (and target implicit-cross-inputs?)
(standard-cross-packages target 'target)
'()))
(outputs outputs)