diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-12-26 00:54:45 +0200 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2017-01-25 00:01:52 +0200 |
| commit | de3cac0eceb2c746aeba20ae743c03cefca232e2 (patch) | |
| tree | 3d0fbcdd471ccc62133dda1f537507d1eff4b721 /pkgs/stdenv/linux/make-bootstrap-tools.nix | |
| parent | ed74fcf14b477bdf2d96fd80e514cd17c54fbdfe (diff) | |
make-bootstrap-tools.nix test: Use busybox from store
Our bootstrap tools are actually broken right now due to busybox not
working when invoked directly from a store path. (It says e.g.
"0qqqw19y4gmknajw8vg4fvhx9gxdqlhz-busybox: applet not found").
Make this test actually fail in such case, the next commit will fix the
problem with busybox.
Diffstat (limited to 'pkgs/stdenv/linux/make-bootstrap-tools.nix')
| -rw-r--r-- | pkgs/stdenv/linux/make-bootstrap-tools.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix index d31253075c9d..2e7b24af131d 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -170,8 +170,9 @@ rec { }; bootstrapFiles = { - busybox = "${build}/on-server/busybox"; - bootstrapTools = "${build}/on-server/bootstrap-tools.tar.xz"; + # Make them their own store paths to test that busybox still works when the binary is named /nix/store/HASH-busybox + busybox = runCommand "busybox" {} "cp ${build}/on-server/busybox $out"; + bootstrapTools = runCommand "bootstrap-tools.tar.xz" {} "cp ${build}/on-server/bootstrap-tools.tar.xz $out"; }; bootstrapTools = import ./bootstrap-tools { inherit system bootstrapFiles; }; |