diff options
| author | Nicolas Graves <ngraves@ngraves.fr> | 2025-07-08 01:47:58 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2025-09-04 12:19:55 +0200 |
| commit | fcdcfa149d292f88fdfbfc0c9ed31f66d166a327 (patch) | |
| tree | 54faad23bd1f9911716d3cb5925e96914ef1c9c5 | |
| parent | 9073a7e410c717ea191112686c80364790aa2cae (diff) | |
build-system: android-ndk: Improve lower configurability.
* guix/build-system/android-ndk.scm (default-android-build,
default-android-googletest): Add and export variables.
(lower): Add their respective keywords.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
| -rw-r--r-- | guix/build-system/android-ndk.scm | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/guix/build-system/android-ndk.scm b/guix/build-system/android-ndk.scm index 565ec1d363..c4e7063db2 100644 --- a/guix/build-system/android-ndk.scm +++ b/guix/build-system/android-ndk.scm @@ -26,7 +26,9 @@ #:use-module (guix packages) #:use-module (guix build-system) #:use-module (guix build-system gnu) - #:export (android-ndk-build-system)) + #:export (android-ndk-build-system + default-android-build + default-android-googletest)) (define %android-ndk-build-system-modules ;; Build-side modules imported by default. @@ -91,12 +93,15 @@ (define* (lower name #:key source inputs native-inputs outputs system target + (android-build (default-android-build)) + (android-googletest (default-android-googletest)) #:allow-other-keys #:rest arguments) "Return a bag for NAME." (define private-keywords - '(#:target #:inputs #:native-inputs #:outputs)) + '(#:target #:inputs #:native-inputs #:outputs + #:android-build #:android-googletest)) (and (not target) ;; TODO: support cross-compilation (bag @@ -110,8 +115,8 @@ ;; Keep the standard inputs of 'gnu-build-system' ,@(standard-packages))) - (build-inputs `(("android-build" ,(default-android-build)) - ("android-googletest" ,(default-android-googletest)) + (build-inputs `(("android-build" ,android-build) + ("android-googletest" ,android-googletest) ,@native-inputs)) (outputs outputs) (build android-ndk-build) |