summary refs log tree commit diff
path: root/pkgs/stdenv
diff options
context:
space:
mode:
authorWill Dietz <w@wdtz.org>2018-02-12 14:14:57 -0600
committerWill Dietz <w@wdtz.org>2018-02-13 09:45:04 -0600
commit8bedb690a2295b7330380624c9c6241966bb9d1a (patch)
tree85aee1fd6cf9e8250d4d99d4cfd725f43708b14d /pkgs/stdenv
parentd00f200f4eeb3085368693618fda2a1110eec3af (diff)
downloadnixpkgs-8bedb690a2295b7330380624c9c6241966bb9d1a.tar
nixpkgs-8bedb690a2295b7330380624c9c6241966bb9d1a.tar.gz
nixpkgs-8bedb690a2295b7330380624c9c6241966bb9d1a.tar.bz2
nixpkgs-8bedb690a2295b7330380624c9c6241966bb9d1a.tar.lz
nixpkgs-8bedb690a2295b7330380624c9c6241966bb9d1a.tar.xz
nixpkgs-8bedb690a2295b7330380624c9c6241966bb9d1a.tar.zst
nixpkgs-8bedb690a2295b7330380624c9c6241966bb9d1a.zip
add musl bootstrap paths for aarch64, armv6l
Aarch64 tools tested briefly with qemu-aarch64,
but neither have been actually used yet :).

For now only "host" indirectly via binary cache
at cache.allvm.org.
Diffstat (limited to 'pkgs/stdenv')
-rw-r--r--pkgs/stdenv/linux/bootstrap-files/aarch64-musl.nix5
-rw-r--r--pkgs/stdenv/linux/bootstrap-files/armv6l-musl.nix5
-rw-r--r--pkgs/stdenv/linux/default.nix4
3 files changed, 13 insertions, 1 deletions
diff --git a/pkgs/stdenv/linux/bootstrap-files/aarch64-musl.nix b/pkgs/stdenv/linux/bootstrap-files/aarch64-musl.nix
new file mode 100644
index 00000000000..91eeea1abb3
--- /dev/null
+++ b/pkgs/stdenv/linux/bootstrap-files/aarch64-musl.nix
@@ -0,0 +1,5 @@
+{
+  # https://cache.allvm.org
+  busybox = builtins.storePath /nix/store/88snbnw04cldx4c3k9qrd0y2vifld2b2-stdenv-bootstrap-tools-aarch64-unknown-linux-musl/on-server/busybox;
+  bootstrapTools = builtins.storePath /nix/store/88snbnw04cldx4c3k9qrd0y2vifld2b2-stdenv-bootstrap-tools-aarch64-unknown-linux-musl/on-server/bootstrap-tools.tar.xz;
+}
diff --git a/pkgs/stdenv/linux/bootstrap-files/armv6l-musl.nix b/pkgs/stdenv/linux/bootstrap-files/armv6l-musl.nix
new file mode 100644
index 00000000000..ff2cffda932
--- /dev/null
+++ b/pkgs/stdenv/linux/bootstrap-files/armv6l-musl.nix
@@ -0,0 +1,5 @@
+{
+  # https://cache.allvm.org
+  busybox = builtins.storePath /nix/store/m4n9p43b7q8k1wqbpw264947rm70mj1z-stdenv-bootstrap-tools-armv6l-unknown-linux-musleabihf/on-server/busybox;
+  bootstrapTools = builtins.storePath /nix/store/m4n9p43b7q8k1wqbpw264947rm70mj1z-stdenv-bootstrap-tools-armv6l-unknown-linux-musleabihf/on-server/bootstrap-tools.tar.xz;
+}
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index 8a8e52d1dfb..249f788c17a 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -18,7 +18,9 @@
       "mips64el-linux" = import ./bootstrap-files/loongson2f.nix;
     };
     "musl" = {
-      "x86_64-linux" = import ./bootstrap-files/x86_64-musl.nix;
+      "aarch64-linux" = import ./bootstrap-files/aarch64-musl.nix;
+      "armv6l-linux"  = import ./bootstrap-files/armv6l-musl.nix;
+      "x86_64-linux"  = import ./bootstrap-files/x86_64-musl.nix;
     };
   };
   archLookupTable = table.${localSystem.libc}