aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDanny Milosavljevic <dannym@scratchpost.org>2018-05-10 15:31:43 +0200
committerDanny Milosavljevic <dannym@scratchpost.org>2018-05-10 15:35:28 +0200
commitb87fc9ab9d619e83947c5a281b682338df136fc6 (patch)
treea97e1e407683a7840894cb925de87076cd9cc1d6
parent47a60325ca650e8fc1a291c8655b4297f4de8deb (diff)
downloadguix-b87fc9ab9d619e83947c5a281b682338df136fc6.tar
guix-b87fc9ab9d619e83947c5a281b682338df136fc6.tar.gz
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.
-rw-r--r--gnu/packages/android.scm4
-rw-r--r--guix/build-system/android-ndk.scm6
2 files changed, 5 insertions, 5 deletions
diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm
index 763be48748..d42a7aef1a 100644
--- a/gnu/packages/android.scm
+++ b/gnu/packages/android.scm
@@ -46,7 +46,7 @@
(define-public android-make-stub
(package
(name "android-make-stub")
- (version "0.5.5")
+ (version "0.6.0")
(source
(origin
(method git-fetch)
@@ -57,7 +57,7 @@
version "-checkout"))
(sha256
(base32
- "0shm4xvc2v6dn6pxydy6yn64qrrpcvx8ssmym9053wk0w5s9wp9q"))))
+ "0y1b2x96d37n6f1bp6dcx08bn08zac0cylmbfsx6mf2nahc02fhc"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; None exist.
diff --git a/guix/build-system/android-ndk.scm b/guix/build-system/android-ndk.scm
index 029f654bb3..dbfa626a19 100644
--- a/guix/build-system/android-ndk.scm
+++ b/guix/build-system/android-ndk.scm
@@ -67,8 +67,8 @@
#:make-flags (cons* "-f"
,(string-append
(derivation->output-path
- (car (assoc-ref inputs "android-make-stub")))
- "/share/android-make-stub/Makefile")
+ (car (assoc-ref inputs "android-build")))
+ "/share/android/build/core/main.mk")
,make-flags)
#:outputs %outputs
#:search-paths ',(map search-path-specification->sexp
@@ -112,7 +112,7 @@
;; Keep the standard inputs of 'gnu-build-system'
,@(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))
,@native-inputs))
(outputs outputs)