~ruther/guix-local: gnu: bootar: Remove input label.

87f0ad602b8a68f507050ac0d4db6bbeebbba911 — Ludovic Courtès 1 year, 7 months ago 4ead533

gnu: bootar: Remove input label.

* gnu/packages/commencement.scm (bootar)[arguments]: Use
‘search-input-file’ and use gexps.  Remove non-top-level ‘use-modules’
from #:phases and pass #:modules instead.
[inputs]: Remove label.

Change-Id: Idb962dc5f886ec13ef10b90ea6b4d1292b412312

patch browse .tar.gz .zip

1 files changed, 25 insertions(+), 21 deletions(-)

M gnu/packages/commencement.scm

M gnu/packages/commencement.scm => gnu/packages/commencement.scm +25 -21

@@ 161,27 161,31 @@ the checkout from TARBALL, a tarball containing said checkout.
                 "0cf5vj5yxfvkgzvjvh2l7b2nz5ji5l534n9g4mfp8f5jsjqdrqjc"))))
     (build-system gnu-build-system)
     (arguments
-     `(#:implicit-inputs? #f
-       #:tests? #f
-       #:guile ,%bootstrap-guile
-       #:imported-modules ((guix build gnu-bootstrap)
-                           ,@%default-gnu-imported-modules)
-       #:phases
-       (begin
-         (use-modules (guix build gnu-bootstrap))
-         (modify-phases %standard-phases
-           (replace 'unpack
-             (lambda* (#:key inputs #:allow-other-keys)
-               (let* ((source (assoc-ref inputs "source"))
-                      (guile-dir (assoc-ref inputs "guile"))
-                      (guile (string-append guile-dir "/bin/guile")))
-                 (invoke guile "--no-auto-compile" source)
-                 (chdir "bootar"))))
-           (replace 'configure (bootstrap-configure "Bootar" ,version
-                                                    '(".") "scripts"))
-           (replace 'build (bootstrap-build '(".")))
-           (replace 'install (bootstrap-install '(".") "scripts"))))))
-    (inputs `(("guile" ,%bootstrap-guile)))
+     (list #:implicit-inputs? #f
+           #:tests? #f
+           #:guile %bootstrap-guile
+           #:imported-modules `((guix build gnu-bootstrap)
+                                ,@%default-gnu-imported-modules)
+           #:modules `((guix build gnu-bootstrap)
+                       ,@%default-gnu-modules)
+           #:phases
+           #~(modify-phases %standard-phases
+               (replace 'unpack
+                 (lambda* (#:key inputs #:allow-other-keys)
+                   (let* ((source #+(package-source this-package))
+                          (guile (search-input-file inputs
+                                                    "/bin/guile")))
+                     (invoke guile "--no-auto-compile" source)
+                     (chdir "bootar"))))
+               (replace 'configure
+                 (bootstrap-configure "Bootar"
+                                      #$version
+                                      '(".") "scripts"))
+               (replace 'build
+                 (bootstrap-build '(".")))
+               (replace 'install
+                 (bootstrap-install '(".") "scripts")))))
+    (inputs (list %bootstrap-guile))
     (home-page "https://git.ngyro.com/bootar")
     (synopsis "Tar decompression and extraction in Guile Scheme")
     (description "Bootar is a simple Tar extractor written in Guile