nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: android-make-stub: Update to 0.6.0. 

* gnu/packages/android.scm (android-make-stub): Update to 0.6.0.
* guix/build-system/android-ndk.scm (android-ndk-build): Modify.
(lower): Modify.
This commit is contained in:
Danny Milosavljevic 2018-05-10 15:31:43 +02:00
parent 47a60325ca
commit b87fc9ab9d
No known key found for this signature in database
GPG Key ID: E71A35542C30BAA5
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gnu/packages/android.scm
View File

@ -46,7 +46,7 @@
(define-public android-make-stub (define-public android-make-stub
(package (package
(name "android-make-stub") (name "android-make-stub")
(version "0.5.5") (version "0.6.0")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -57,7 +57,7 @@
version "-checkout")) version "-checkout"))
(sha256 (sha256
(base32 (base32
"0shm4xvc2v6dn6pxydy6yn64qrrpcvx8ssmym9053wk0w5s9wp9q")))) "0y1b2x96d37n6f1bp6dcx08bn08zac0cylmbfsx6mf2nahc02fhc"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ; None exist. `(#:tests? #f ; None exist.

6
guix/build-system/android-ndk.scm
View File

@ -67,8 +67,8 @@
#:make-flags (cons* "-f" #:make-flags (cons* "-f"
,(string-append ,(string-append
(derivation->output-path (derivation->output-path
(car (assoc-ref inputs "android-make-stub"))) (car (assoc-ref inputs "android-build")))
"/share/android-make-stub/Makefile") "/share/android/build/core/main.mk")
,make-flags) ,make-flags)
#:outputs %outputs #:outputs %outputs
#:search-paths ',(map search-path-specification->sexp #:search-paths ',(map search-path-specification->sexp
@ -112,7 +112,7 @@
;; Keep the standard inputs of 'gnu-build-system' ;; Keep the standard inputs of 'gnu-build-system'
,@(standard-packages))) ,@(standard-packages)))
(build-inputs `(("android-make-stub" ,(module-ref (resolve-interface '(gnu packages android)) 'android-make-stub)) (build-inputs `(("android-build" ,(module-ref (resolve-interface '(gnu packages android)) 'android-make-stub))
("android-googletest" ,(module-ref (resolve-interface '(gnu packages android)) 'android-googletest)) ("android-googletest" ,(module-ref (resolve-interface '(gnu packages android)) 'android-googletest))
,@native-inputs)) ,@native-inputs))
(outputs outputs) (outputs outputs)