~ruther/guix-local

4ead533379cb90fc18f2b64d841f64822dd442b7 — Ludovic Courtès 1 year, 7 months ago c57975b
gnu-bootstrap: Use ‘search-input-file’.

* guix/build/gnu-bootstrap.scm (bootstrap-configure)
(bootstrap-install): Use ‘search-input-file’ instead of ‘assoc-ref’.

Change-Id: I8cd876d099a346b55b5e06b3a220f712dd504791
1 files changed, 2 insertions(+), 4 deletions(-)

M guix/build/gnu-bootstrap.scm
M guix/build/gnu-bootstrap.scm => guix/build/gnu-bootstrap.scm +2 -4
@@ 39,8 39,7 @@ directory and configure all of the '.in' files with the bootstrap
Guile and its module and object directories."
  (lambda* (#:key inputs outputs #:allow-other-keys)
    (let* ((out (assoc-ref outputs "out"))
           (guile-dir (assoc-ref inputs "guile"))
           (guile (string-append guile-dir "/bin/guile"))
           (guile (search-input-file inputs "/bin/guile"))
           (moddir (string-append out "/share/guile/site/"
                                  (effective-version)))
           (godir (string-append out "/lib/guile/"


@@ 92,8 91,7 @@ directories in MODULES, and all the executable files in the SCRIPTS
directory."
  (lambda* (#:key inputs outputs #:allow-other-keys)
    (let* ((out (assoc-ref outputs "out"))
           (guile-dir (assoc-ref inputs "guile"))
           (guile (string-append guile-dir "/bin/guile"))
           (guile (search-input-file inputs "/bin/guile"))
           (moddir (string-append out "/share/guile/site/"
                                  (effective-version)))
           (godir (string-append out "/lib/guile/"