diff options
| author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2023-03-10 13:09:25 +0100 |
|---|---|---|
| committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2023-03-10 13:09:25 +0100 |
| commit | ef91384e6f647adc49be4d2ed8e248af68ab63ea (patch) | |
| tree | 86f78bd8c242fd6d47de21f8779954abeddbc070 /pkgs/stdenv | |
| parent | da1a690688b0e6923ccb86ea7b7f59fa7df85db0 (diff) | |
| parent | b9c00c1d41ccd6385da243415299b39aa73357be (diff) | |
| download | nixpkgs-ef91384e6f647adc49be4d2ed8e248af68ab63ea.tar nixpkgs-ef91384e6f647adc49be4d2ed8e248af68ab63ea.tar.gz nixpkgs-ef91384e6f647adc49be4d2ed8e248af68ab63ea.tar.bz2 nixpkgs-ef91384e6f647adc49be4d2ed8e248af68ab63ea.tar.lz nixpkgs-ef91384e6f647adc49be4d2ed8e248af68ab63ea.tar.xz nixpkgs-ef91384e6f647adc49be4d2ed8e248af68ab63ea.tar.zst nixpkgs-ef91384e6f647adc49be4d2ed8e248af68ab63ea.zip | |
Merge remote-tracking branch 'origin/master' into staging-next
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/linux/bootstrap-files/mips64el-n32.nix | 25 | ||||
| -rw-r--r-- | pkgs/stdenv/linux/default.nix | 5 |
2 files changed, 29 insertions, 1 deletions
diff --git a/pkgs/stdenv/linux/bootstrap-files/mips64el-n32.nix b/pkgs/stdenv/linux/bootstrap-files/mips64el-n32.nix new file mode 100644 index 00000000000..cf26c2113ec --- /dev/null +++ b/pkgs/stdenv/linux/bootstrap-files/mips64el-n32.nix @@ -0,0 +1,25 @@ +# +# Files came from this Hydra build: +# +# https://hydra.nixos.org/build/188389586 +# +# Which used nixpkgs revision 97d9c84e1df4397b43ecb39359f1bd003cd44585 +# to instantiate: +# +# /nix/store/hakn8s85s9011v61r6svp5qy8x1y64fv-stdenv-bootstrap-tools-mips64el-unknown-linux-gnuabin32.drv +# +# and then built: +# +# /nix/store/rjgybpnf3yiqyhvl2n2lx31jf800fii2-stdenv-bootstrap-tools-mips64el-unknown-linux-gnuabin32 +# +{ + busybox = import <nix/fetchurl.nix> { + url = "http://tarballs.nixos.org/stdenv-linux/mips64el-n32/97d9c84e1df4397b43ecb39359f1bd003cd44585/busybox"; + sha256 = "sha256-4N3G1qYA7vitjhsIW17pR6UixIuzrq4vZXa8F0/X4iI="; + executable = true; + }; + bootstrapTools = import <nix/fetchurl.nix> { + url = "http://tarballs.nixos.org/stdenv-linux/mips64el-n32/97d9c84e1df4397b43ecb39359f1bd003cd44585/bootstrap-tools.tar.xz"; + sha256 = "sha256-LWrpN6su2yNVurUyhZP34OiZyzgh7MfN13fIIbou8KI="; + }; +} diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 18a593b058d..51f217f03b2 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -69,7 +69,10 @@ armv7l-linux = import ./bootstrap-files/armv7l.nix; aarch64-linux = import ./bootstrap-files/aarch64.nix; mipsel-linux = import ./bootstrap-files/loongson2f.nix; - mips64el-linux = import ./bootstrap-files/mips64el.nix; + mips64el-linux = import + (if localSystem.isMips64n32 + then ./bootstrap-files/mips64el-n32.nix + else ./bootstrap-files/mips64el.nix); powerpc64le-linux = import ./bootstrap-files/powerpc64le.nix; riscv64-linux = import ./bootstrap-files/riscv64.nix; }; |