From 60c21332d2092cf16feee5bfc384ca4c94c15a23 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 25 Oct 2012 17:41:18 +0200 Subject: distro: Bootstrap using our own binaries instead of those from Nixpkgs. * distro/packages/base.scm (%bootstrap-inputs): Switch to using our own bootstrap binaries instead of those from Nixpkgs. --- distro/packages/base.scm | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/distro/packages/base.scm b/distro/packages/base.scm index 871b6c7249..f17dd44d16 100644 --- a/distro/packages/base.scm +++ b/distro/packages/base.scm @@ -1368,16 +1368,6 @@ with the Linux kernel.") ;;; Bootstrap packages. ;;; -(define %bootstrap-inputs - (compile-time-value - `(("libc" ,(nixpkgs-derivation "glibc")) - ,@(map (lambda (name) - (list name (nixpkgs-derivation name))) - '("gnutar" "gzip" "bzip2" "xz" "patch" - "coreutils" "gnused" "gnugrep" "bash" - "gawk" ; used by `config.status' - "gcc" "binutils"))))) - (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. @@ -1629,6 +1619,14 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \ (long-description #f) (home-page #f))) +(define %bootstrap-inputs + ;; The initial, pre-built inputs. From now on, we can start building our + ;; own packages. + `(("libc" ,%bootstrap-glibc) + ("gcc" ,%bootstrap-gcc) + ("binutils" ,%bootstrap-binutils) + ("coreutils&co" ,%bootstrap-coreutils&co))) + (define package-with-bootstrap-guile (memoize (lambda (p) -- cgit 1.4.1