amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

build-system: android-ndk: Improve style.

Browse source 
Like in other build-systems, make proper procedures to resolve the
build-system build-inputs bindings.

* guix/build-system/android-ndk.scm (default-android-build,
default-android-googletest): Add procedures.
(lower): Use them.

Signed-off-by: Christopher Baines <mail@cbaines.net>
This commit is contained in:
Nicolas Graves 2025-04-25 11:26:34 +02:00 • committed by Christopher Baines
parent 97a25bb484
commit ac026164be
No known key found for this signature in database
GPG key ID: 5E28A33B0B84F577
1 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

14
guix/build-system/android-ndk.scm
View file

@ -33,6 +33,16 @@
`((guix build android-ndk-build-system) `((guix build android-ndk-build-system)
,@%default-gnu-imported-modules)) ,@%default-gnu-imported-modules))
(define (default-android-build)
;; Lazily resolve the binding to avoid a circular dependency.
(let ((android (resolve-interface '(gnu packages android))))
(module-ref android 'android-make-stub)))
(define (default-android-googletest)
;; Lazily resolve the binding to avoid a circular dependency.
(let ((android (resolve-interface '(gnu packages android))))
(module-ref android 'android-googletest)))
(define* (android-ndk-build name inputs (define* (android-ndk-build name inputs
#:key #:key
source source
@ -100,8 +110,8 @@
;; Keep the standard inputs of 'gnu-build-system' ;; Keep the standard inputs of 'gnu-build-system'
,@(standard-packages))) ,@(standard-packages)))
(build-inputs `(("android-build" ,(module-ref (resolve-interface '(gnu packages android)) 'android-make-stub)) (build-inputs `(("android-build" ,(default-android-build))
("android-googletest" ,(module-ref (resolve-interface '(gnu packages android)) 'android-googletest)) ("android-googletest" ,(default-android-googletest))
,@native-inputs)) ,@native-inputs))
(outputs outputs) (outputs outputs)
(build android-ndk-build) (build android-ndk-build)