diff options
author | Ludovic Courtès <ludo@gnu.org> | 2019-10-08 11:23:22 +0200 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2019-10-08 11:37:07 +0200 |
commit | cf3d1763ede1a329c2bc932c84591ab594bb6c96 (patch) | |
tree | 665f92418f8671474de3815241fb657384463c94 /gnu/packages/android.scm | |
parent | d57660c54907cc6fba8b0adf6295fd2311ada6cf (diff) | |
parent | 2fa55c72476c73211cbb2d6b29c05a1ad58a6cf9 (diff) | |
download | guix-cf3d1763ede1a329c2bc932c84591ab594bb6c96.tar guix-cf3d1763ede1a329c2bc932c84591ab594bb6c96.tar.gz |
Merge branch 'core-updates'
Diffstat (limited to 'gnu/packages/android.scm')
-rw-r--r-- | gnu/packages/android.scm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm index 337e60a641..b312c5b2af 100644 --- a/gnu/packages/android.scm +++ b/gnu/packages/android.scm @@ -38,6 +38,7 @@ #:use-module (gnu packages check) #:use-module (gnu packages compression) #:use-module (gnu packages docker) + #:use-module (gnu packages gcc) #:use-module (gnu packages gnupg) #:use-module (gnu packages java) #:use-module (gnu packages linux) @@ -375,7 +376,7 @@ various Android core host applications.") `(("android-libbase" ,android-libbase) ("android-libcutils" ,android-libcutils) ("android-liblog" ,android-liblog) - ("openssl" ,openssl))) + ("openssl" ,openssl-1.0))) (home-page "https://developer.android.com/studio/command-line/adb.html") (synopsis "Android Debug Bridge") (description @@ -616,7 +617,8 @@ file system.") ("android-libcutils" ,android-libcutils))) (native-inputs `(("android-bionic-uapi" ,android-bionic-uapi) - ("android-liblog" ,android-liblog))) + ("android-liblog" ,android-liblog) + ("gcc" ,gcc-5))) ; XXX: fails to build with GCC 7 (home-page "https://developer.android.com/") (synopsis "Android utility library") (description "@code{android-libutils} provides utilities for Android NDK developers.") |