diff options
Diffstat (limited to 'gnu/packages/bootstrap.scm')
| -rw-r--r-- | gnu/packages/bootstrap.scm | 76 |
1 files changed, 43 insertions, 33 deletions
diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index 71ccb19597..efa8cd89eb 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -164,34 +164,25 @@ check whether everything is alright." ;;; Bootstrap packages. ;;; -(define %bootstrap-guile - ;; The Guile used to run the build scripts of the initial derivations. - ;; It is just unpacked from a tarball containing a pre-built binary. - ;; This is typically built using %GUILE-BOOTSTRAP-TARBALL below. - ;; - ;; XXX: Would need libc's `libnss_files2.so' for proper `getaddrinfo' - ;; support (for /etc/services). - (let ((raw (build-system - (name "raw") - (description "Raw build system with direct store access") - (build (lambda* (store name source inputs - #:key outputs system search-paths) - (define (->store file) - (add-to-store store file #t "sha256" - (or (search-bootstrap-binary file - system) - (error "bootstrap binary not found" - file system)))) +(define* (raw-build store name inputs + #:key outputs system search-paths + #:allow-other-keys) + (define (->store file) + (add-to-store store file #t "sha256" + (or (search-bootstrap-binary file + system) + (error "bootstrap binary not found" + file system)))) - (let* ((tar (->store "tar")) - (xz (->store "xz")) - (mkdir (->store "mkdir")) - (bash (->store "bash")) - (guile (->store "guile-2.0.9.tar.xz")) - (builder - (add-text-to-store store - "build-bootstrap-guile.sh" - (format #f " + (let* ((tar (->store "tar")) + (xz (->store "xz")) + (mkdir (->store "mkdir")) + (bash (->store "bash")) + (guile (->store "guile-2.0.9.tar.xz")) + (builder + (add-text-to-store store + "build-bootstrap-guile.sh" + (format #f " echo \"unpacking bootstrap Guile to '$out'...\" ~a $out cd $out @@ -199,12 +190,31 @@ cd $out # Sanity check. $out/bin/guile --version~%" - mkdir xz guile tar) - (list mkdir xz guile tar)))) - (derivation store name - bash `(,builder) - #:system system - #:inputs `((,bash) (,builder))))))))) + mkdir xz guile tar) + (list mkdir xz guile tar)))) + (derivation store name + bash `(,builder) + #:system system + #:inputs `((,bash) (,builder))))) + +(define* (make-raw-bag name + #:key source inputs native-inputs outputs target) + (bag + (name name) + (build-inputs inputs) + (build raw-build))) + +(define %bootstrap-guile + ;; The Guile used to run the build scripts of the initial derivations. + ;; It is just unpacked from a tarball containing a pre-built binary. + ;; This is typically built using %GUILE-BOOTSTRAP-TARBALL below. + ;; + ;; XXX: Would need libc's `libnss_files2.so' for proper `getaddrinfo' + ;; support (for /etc/services). + (let ((raw (build-system + (name 'raw) + (description "Raw build system with direct store access") + (lower make-raw-bag)))) (package (name "guile-bootstrap") (version "2.0") |