diff options
author | John Ericson <jericson@galois.com> | 2016-12-15 17:09:29 -0500 |
---|---|---|
committer | John Ericson <jericson@galois.com> | 2016-12-15 17:09:29 -0500 |
commit | 7960a1b1b8fa1ca097bee2971fbbc18bda3dcadd (patch) | |
tree | 482c745af3a462d5c216197d0c64c8c6f6cc7b9a /pkgs/stdenv/linux/make-bootstrap-tools.nix | |
parent | 670256dc399ab637fa94df9a90fb13f275c39f8a (diff) |
linux stdenv: Avoid `assert false`
On one hand, don't want to pass garbage that affects hash, on the other
hand footguns are bad.
Now, factored out the derivation so only need to pass in what is used.
Diffstat (limited to 'pkgs/stdenv/linux/make-bootstrap-tools.nix')
-rw-r--r-- | pkgs/stdenv/linux/make-bootstrap-tools.nix | 11 |
1 files changed, 1 insertions, 10 deletions
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"; |