about summary refs log tree commit diff
diff options
context:
space:
mode:
-rwxr-xr-xpkgs/stdenv/linux/bootstrap/x86_64/bashbin0 -> 615848 bytes
-rwxr-xr-xpkgs/stdenv/linux/bootstrap/x86_64/bunzip2bin0 -> 75744 bytes
-rwxr-xr-xpkgs/stdenv/linux/bootstrap/x86_64/cpbin0 -> 62536 bytes
-rwxr-xr-xpkgs/stdenv/linux/bootstrap/x86_64/curl.bz2bin0 -> 152960 bytes
-rw-r--r--pkgs/stdenv/linux/bootstrap/x86_64/default.nix27
-rwxr-xr-xpkgs/stdenv/linux/bootstrap/x86_64/tar.bz2bin0 -> 102997 bytes
-rw-r--r--pkgs/stdenv/linux/new.nix5
7 files changed, 31 insertions, 1 deletions
diff --git a/pkgs/stdenv/linux/bootstrap/x86_64/bash b/pkgs/stdenv/linux/bootstrap/x86_64/bash
new file mode 100755
index 0000000000000..bb5a596caee01
--- /dev/null
+++ b/pkgs/stdenv/linux/bootstrap/x86_64/bash
Binary files differdiff --git a/pkgs/stdenv/linux/bootstrap/x86_64/bunzip2 b/pkgs/stdenv/linux/bootstrap/x86_64/bunzip2
new file mode 100755
index 0000000000000..91dbd4b1427c3
--- /dev/null
+++ b/pkgs/stdenv/linux/bootstrap/x86_64/bunzip2
Binary files differdiff --git a/pkgs/stdenv/linux/bootstrap/x86_64/cp b/pkgs/stdenv/linux/bootstrap/x86_64/cp
new file mode 100755
index 0000000000000..7173831452813
--- /dev/null
+++ b/pkgs/stdenv/linux/bootstrap/x86_64/cp
Binary files differdiff --git a/pkgs/stdenv/linux/bootstrap/x86_64/curl.bz2 b/pkgs/stdenv/linux/bootstrap/x86_64/curl.bz2
new file mode 100755
index 0000000000000..ad440f969ac5f
--- /dev/null
+++ b/pkgs/stdenv/linux/bootstrap/x86_64/curl.bz2
Binary files differdiff --git a/pkgs/stdenv/linux/bootstrap/x86_64/default.nix b/pkgs/stdenv/linux/bootstrap/x86_64/default.nix
new file mode 100644
index 0000000000000..88f0236d37a2e
--- /dev/null
+++ b/pkgs/stdenv/linux/bootstrap/x86_64/default.nix
@@ -0,0 +1,27 @@
+{
+  bash = ./bash;
+  bunzip2 = ./bunzip2;
+  cp = ./cp;
+  curl = ./curl.bz2;
+  tar = ./tar.bz2;
+
+  staticToolsURL = {
+    url = file:///tmp/tarballs/static-tools.tar.bz2;
+    sha1 = "806f9644bf155069315bdd66138764b3d8619348";
+  };
+
+  binutilsURL = {
+    url = file:///tmp/tarballs/binutils.tar.bz2;
+    sha1 = "b55055c50cfcd2ab02e20f49ad8ca72315252a1c";
+  };
+
+  gccURL = {
+    url = file:///tmp/tarballs/gcc.tar.bz2;
+    sha1 = "a2ac17b6e7ce6d07c01e090b801c1622f56d8b39";
+  };
+
+  glibcURL = {
+    url = file:///tmp/tarballs/glibc.tar.bz2;
+    sha1 = "59d4d5a25ecd8b2f741d80e80d172bd6e7e06d89";
+  };
+}
diff --git a/pkgs/stdenv/linux/bootstrap/x86_64/tar.bz2 b/pkgs/stdenv/linux/bootstrap/x86_64/tar.bz2
new file mode 100755
index 0000000000000..29b97f8a32c4f
--- /dev/null
+++ b/pkgs/stdenv/linux/bootstrap/x86_64/tar.bz2
Binary files differdiff --git a/pkgs/stdenv/linux/new.nix b/pkgs/stdenv/linux/new.nix
index 31a78ec20579c..c3867392b4d7b 100644
--- a/pkgs/stdenv/linux/new.nix
+++ b/pkgs/stdenv/linux/new.nix
@@ -8,7 +8,10 @@
 
 rec {
 
-  bootstrapTools = import ./bootstrap/i686;
+  bootstrapTools =
+    if system == "i686-linux" then import ./bootstrap/i686
+    else if system == "x86_64-linux" then import ./bootstrap/x86_64
+    else abort "unsupported platform for the pure Linux stdenv";
 
 
   # The bootstrap process proceeds in several steps.