From 8297f01ee0094005c1d40923f605360a15030628 Mon Sep 17 00:00:00 2001
From: Danny Milosavljevic <dannym@scratchpost.org>
Date: Thu, 10 May 2018 04:13:00 +0200
Subject: gnu: fastboot: Simplify package.

* gnu/packages/android.scm (fastboot)[source]: Use android-platform-system-core.
[arguments]<#:phases>[unpack]: Remove.
<#:phases>[enter-source]: Modify.
<#:phases>[patch-source]: New phase.
[native-inputs]: Remove core, extras.
---
 gnu/packages/android.scm | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm
index 812898c8ac..d09cd635e5 100644
--- a/gnu/packages/android.scm
+++ b/gnu/packages/android.scm
@@ -586,25 +586,20 @@ (define-public fastboot
   (package
     (name "fastboot")
     (version (android-platform-version))
-    (source #f)
+    (source (android-platform-system-core version))
     (build-system android-ndk-build-system)
     (arguments
      `(#:make-flags (list "CXXFLAGS=-std=gnu++11")
        #:phases
        (modify-phases %standard-phases
-         (replace 'unpack
-           (lambda* (#:key inputs #:allow-other-keys)
-             (mkdir-p "core")
-             (with-directory-excursion "core"
-               (invoke "tar" "axf" (assoc-ref inputs "core") "--strip-components=1")
-               (substitute* "fastboot/Android.mk"
-                (("libext4_utils_host") "libext4_utils_host libselinux libpcre")))
-             (copy-recursively (assoc-ref inputs "extras") "extras"
-                               #:keep-mtime? #t)
-             #t))
          (add-after 'unpack 'enter-source
            (lambda _
-             (chdir "core/fastboot")
+             (chdir "fastboot")
+             #t))
+         (add-after 'enter-source 'patch-source
+           (lambda _
+             (substitute* "Android.mk"
+              (("libext4_utils_host") "libext4_utils_host libselinux libpcre"))
              #t))
          (replace 'install
            (lambda* (#:key outputs #:allow-other-keys)
@@ -629,9 +624,7 @@ (define-public fastboot
        ("mkbootimg" ,mkbootimg)
        ("zlib" ,zlib)))
     (native-inputs
-     `(("core" ,(android-platform-system-core version))
-       ("extras" ,(android-platform-system-extras version))
-       ("xz" ,xz)))
+     `(("xz" ,xz)))
     (home-page "https://developer.android.com/studio/command-line/")
     (synopsis "Android image flasher")
     (description
-- 
cgit v1.2.3