diff options
author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-10-01 17:10:49 -0400 |
---|---|---|
committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-10-01 17:10:49 -0400 |
commit | 2e65e4834a226c570866f2e8976ed7f252b45cd1 (patch) | |
tree | 21d625bce8d03627680214df4a6622bf8eb79dc9 /guix/android-repo-download.scm | |
parent | 9c68ecb24dd1660ce736cdcdea0422a73ec318a2 (diff) | |
parent | f1a3c11407b52004e523ec5de20d326c5661681f (diff) |
Merge remote-tracking branch 'origin/master' into staging
With resolved conflicts in:
gnu/packages/bittorrent.scm
gnu/packages/databases.scm
gnu/packages/geo.scm
gnu/packages/gnupg.scm
gnu/packages/gstreamer.scm
gnu/packages/gtk.scm
gnu/packages/linux.scm
gnu/packages/python-xyz.scm
gnu/packages/xorg.scm
guix/build/qt-utils.scm
Diffstat (limited to 'guix/android-repo-download.scm')
-rw-r--r-- | guix/android-repo-download.scm | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/guix/android-repo-download.scm b/guix/android-repo-download.scm index 5ff3e7edd4..1c3502e673 100644 --- a/guix/android-repo-download.scm +++ b/guix/android-repo-download.scm @@ -78,6 +78,9 @@ generic name if unset." (define zlib (module-ref (resolve-interface '(gnu packages compression)) 'zlib)) + (define guile-json + (module-ref (resolve-interface '(gnu packages guile)) 'guile-json-4)) + (define gnutls (module-ref (resolve-interface '(gnu packages tls)) 'gnutls)) @@ -99,7 +102,7 @@ generic name if unset." (define build (with-imported-modules modules - (with-extensions (list gnutls) + (with-extensions (list gnutls guile-json) ;for (guix swh) #~(begin (use-modules (guix build android-repo) (guix build utils) |