aboutsummaryrefslogtreecommitdiff
path: root/pkgs/stdenv/linux/bootstrap-files
diff options
context:
space:
mode:
authorWill Dietz <w@wdtz.org>2018-02-13 08:04:51 -0600
committerWill Dietz <w@wdtz.org>2018-02-13 09:45:05 -0600
commit84a527ea5e8db2a1ec095ff95dd66d6271246bc4 (patch)
treeabed8c7fdcccaf2c64dd7fd006762be02f7707b1 /pkgs/stdenv/linux/bootstrap-files
parent4619f8e06d33b72a424cdc0a603953d275c62220 (diff)
x86_64-musl bootstrap: use separate 64bit busybox
Avoid issues like #24954.
Diffstat (limited to 'pkgs/stdenv/linux/bootstrap-files')
-rw-r--r--pkgs/stdenv/linux/bootstrap-files/x86_64-musl.nix8
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/stdenv/linux/bootstrap-files/x86_64-musl.nix b/pkgs/stdenv/linux/bootstrap-files/x86_64-musl.nix
index b3bf804ca38e..12093f340008 100644
--- a/pkgs/stdenv/linux/bootstrap-files/x86_64-musl.nix
+++ b/pkgs/stdenv/linux/bootstrap-files/x86_64-musl.nix
@@ -1,7 +1,9 @@
-# Use busybox for i686-linux since it works on x86_64-linux as well.
-(import ./i686.nix) //
-
{
+ busybox = import <nix/fetchurl.nix> {
+ url = https://wdtz.org/files/030q34q7fk6jdfxkgcqp5rzr4yhw3pgx-stdenv-bootstrap-tools-x86_64-unknown-linux-musl/on-server/busybox;
+ sha256 = "16lzrwwvdk6q3g08gs45pldz0rh6xpln2343xr444960h6wqxl5v";
+ executable = true;
+ };
bootstrapTools = import <nix/fetchurl.nix> {
url = https://wdtz.org/files/030q34q7fk6jdfxkgcqp5rzr4yhw3pgx-stdenv-bootstrap-tools-x86_64-unknown-linux-musl/on-server/bootstrap-tools.tar.xz;
sha256 = "0ly0wj8wzbikn2j8sn727vikk90bq36drh98qvfx1kkh5k5azm2j";