diff options
| author | Will Dietz <w@wdtz.org> | 2018-02-13 08:04:51 -0600 |
|---|---|---|
| committer | Will Dietz <w@wdtz.org> | 2018-02-13 09:45:05 -0600 |
| commit | 84a527ea5e8db2a1ec095ff95dd66d6271246bc4 (patch) | |
| tree | abed8c7fdcccaf2c64dd7fd006762be02f7707b1 /pkgs/stdenv | |
| parent | 4619f8e06d33b72a424cdc0a603953d275c62220 (diff) | |
| download | nixpkgs-84a527ea5e8db2a1ec095ff95dd66d6271246bc4.tar nixpkgs-84a527ea5e8db2a1ec095ff95dd66d6271246bc4.tar.gz nixpkgs-84a527ea5e8db2a1ec095ff95dd66d6271246bc4.tar.bz2 nixpkgs-84a527ea5e8db2a1ec095ff95dd66d6271246bc4.tar.lz nixpkgs-84a527ea5e8db2a1ec095ff95dd66d6271246bc4.tar.xz nixpkgs-84a527ea5e8db2a1ec095ff95dd66d6271246bc4.tar.zst nixpkgs-84a527ea5e8db2a1ec095ff95dd66d6271246bc4.zip | |
x86_64-musl bootstrap: use separate 64bit busybox
Avoid issues like #24954.
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/linux/bootstrap-files/x86_64-musl.nix | 8 |
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 b3bf804ca38..12093f34000 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"; |