mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-23 13:48:21 +03:00
parent
a551e6debc
commit
0a0ecc4c2c
@ -17,4 +17,5 @@ in with (import ../../../lib).systems.examples; {
|
|||||||
i686-musl = make musl32;
|
i686-musl = make musl32;
|
||||||
armv6l-musl = make muslpi;
|
armv6l-musl = make muslpi;
|
||||||
aarch64-musl = make aarch64-multiplatform-musl;
|
aarch64-musl = make aarch64-multiplatform-musl;
|
||||||
|
riscv64 = make riscv64;
|
||||||
}
|
}
|
||||||
|
@ -5,6 +5,7 @@
|
|||||||
let
|
let
|
||||||
pkgs = import ../../.. { inherit localSystem crossSystem; };
|
pkgs = import ../../.. { inherit localSystem crossSystem; };
|
||||||
libc = pkgs.stdenv.cc.libc;
|
libc = pkgs.stdenv.cc.libc;
|
||||||
|
isl = with pkgs; if targetPlatform.isRiscV then isl_0_17 else isl_0_14;
|
||||||
in with pkgs; rec {
|
in with pkgs; rec {
|
||||||
|
|
||||||
|
|
||||||
@ -19,7 +20,7 @@ in with pkgs; rec {
|
|||||||
tarMinimal = gnutar.override { acl = null; };
|
tarMinimal = gnutar.override { acl = null; };
|
||||||
|
|
||||||
busyboxMinimal = busybox.override {
|
busyboxMinimal = busybox.override {
|
||||||
useMusl = true;
|
useMusl = !targetPlatform.isRiscV;
|
||||||
enableStatic = true;
|
enableStatic = true;
|
||||||
enableMinimal = true;
|
enableMinimal = true;
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
@ -143,7 +144,7 @@ in with pkgs; rec {
|
|||||||
# These needed for cross but not native tools because the stdenv
|
# These needed for cross but not native tools because the stdenv
|
||||||
# GCC has certain things built in statically. See
|
# GCC has certain things built in statically. See
|
||||||
# pkgs/stdenv/linux/default.nix for the details.
|
# pkgs/stdenv/linux/default.nix for the details.
|
||||||
cp -d ${isl_0_14.out}/lib/libisl*.so* $out/lib
|
cp -d ${isl.out}/lib/libisl*.so* $out/lib
|
||||||
|
|
||||||
'' + ''
|
'' + ''
|
||||||
cp -d ${bzip2.out}/lib/libbz2.so* $out/lib
|
cp -d ${bzip2.out}/lib/libbz2.so* $out/lib
|
||||||
|
Loading…
Reference in New Issue
Block a user