4 files changed, 20 insertions, 26 deletions
diff --git a/pkgs/stdenv/linux/bootstrap-tools/default.nix b/pkgs/stdenv/linux/bootstrap-tools/default.nix
new file mode 100644
index 000000000000..6118585d545f
--- /dev/null
+++ b/pkgs/stdenv/linux/bootstrap-tools/default.nix
@@ -0,0 +1,18 @@
+{ system, bootstrapFiles }:
+
+derivation {
+  name = "bootstrap-tools";
+
+  builder = bootstrapFiles.busybox;
+
+  args = [ "ash" "-e" ./scripts/unpack-bootstrap-tools.sh ];
+
+  tarball = bootstrapFiles.bootstrapTools;
+
+  inherit system;
+
+  # Needed by the GCC wrapper.
+  langC = true;
+  langCC = true;
+  isGNU = true;
+}
diff --git a/pkgs/stdenv/linux/scripts/unpack-bootstrap-tools.sh b/pkgs/stdenv/linux/bootstrap-tools/scripts/unpack-bootstrap-tools.sh
index 85e74aea89ef..85e74aea89ef 100644
--- a/pkgs/stdenv/linux/scripts/unpack-bootstrap-tools.sh
+++ b/pkgs/stdenv/linux/bootstrap-tools/scripts/unpack-bootstrap-tools.sh
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index a39ff61a8b54..9900fc6dd3d5 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -37,22 +37,7 @@ rec {
 
 
   # Download and unpack the bootstrap tools (coreutils, GCC, Glibc, ...).
-  bootstrapTools = derivation {
-    name = "bootstrap-tools";
-
-    builder = bootstrapFiles.busybox;
-
-    args = [ "ash" "-e" ./scripts/unpack-bootstrap-tools.sh ];
-
-    tarball = bootstrapFiles.bootstrapTools;
-
-    inherit system;
-
-    # Needed by the GCC wrapper.
-    langC = true;
-    langCC = true;
-    isGNU = true;
-  };
+  bootstrapTools = import ./bootstrap-tools { inherit system bootstrapFiles; };
 
 
   # This function builds the various standard environments used during
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix
index 26dfee252303..e13fb88eff0b 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix
@@ -173,16 +173,7 @@ rec {
     bootstrapTools = "${build}/on-server/bootstrap-tools.tar.xz";
   };
 
-  bootstrapTools = (import ./default.nix {
-    inherit system bootstrapFiles;
-
-    lib = assert false; null;
-    allPackages = assert false; null;
-
-    platform = assert false; null;
-    crossSystem = null;
-    config = assert false; null;
-  }).bootstrapTools;
+  bootstrapTools = import ./bootstrap-tools { inherit system bootstrapFiles; };
 
   test = derivation {
     name = "test-bootstrap-tools";