22/35: bootstrap-gash-rewire? WIP

[guix-commits]

janneke pushed a commit to branch wip-bootstrap
in repository guix.

commit e80405df56691686237fdd1a7272b561acfb50e1
Author: Jan Nieuwenhuizen <address@hidden>
Date:   Sat Sep 21 18:57:27 2019 +0200

    bootstrap-gash-rewire? WIP
---
 gnu/packages/commencement.scm | 42 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 1fdc848..0e82b11 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -84,6 +84,48 @@
 ;;;
 ;;; Code:
 
+;; FIXME: must rewire because store hashes must also first be removed?
+;; (use-modules (gnu packages shells))
+;; (define %bootstrap-gash-rewired
+;;   (package-with-bootstrap-guile
+;;    (package
+;;      (inherit gash)
+;;      (name "bootstrap-gash-rewired")
+;;      (source #f)
+;;      (native-inputs `(("gash" ,%bootstrap-gash)
+;;                       ("guile" ,%bootstrap-guile)))
+;;      (inputs '())
+;;      (propagated-inputs '())
+;;      (outputs '("out"))
+;;      (build-system trivial-build-system)
+;;      (arguments
+;;       `(#:guile ,%bootstrap-guile
+;;         #:modules ((guix build utils))
+;;         #:builder (begin
+;;                     (use-modules (guix build utils))
+;;                     (let* ((gash (assoc-ref %build-inputs "gash"))
+;;                            (guile (assoc-ref %build-inputs "guile"))
+;;                            (gash-bin (string-append gash "/bin"))
+;;                            (gash-lib (string-append gash "/lib"))
+;;                            (out (assoc-ref %outputs "out"))
+;;                            (bin (string-append out "/bin"))
+;;                            (lib (string-append out "/lib")))
+
+;;                       (define (rewire-script script)
+;;                         (substitute* script
+;;                           ((gash) out)
+;;                           ;;(("/gnu/store[^ ]+guile-bootstrap[^/]*") guile)
+;;                           ((".guile-real") "guile")))
+
+;;                       (format (current-error-port) "bootstrap guile: ~s\n" 
guile)
+;;                       (mkdir-p bin)
+;;                       (for-each (lambda (file) (install-file file bin))
+;;                                 (find-files gash-bin))
+;;                       (copy-recursively gash-lib lib)
+;;                       (for-each rewire-script (find-files bin))
+;;                       #t)))))))
+;; (define %bootstrap-gash-rewired %bootstrap-gash)
+
 (define nyacc-boot
   (package-with-bootstrap-guile
    (package