diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2020-06-12 14:29:22 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-12 14:29:22 -0500 |
| commit | ed6e598747e5a334acfca81c475efd4e98f8f69f (patch) | |
| tree | 7a979c84dc66ac653573817150998362fb7fc3c8 /pkgs/os-specific | |
| parent | 6541ef326755f7da11a3ff2f15d222a1f523f9ce (diff) | |
| parent | 107f7ba0263dc6225cc0d3bafa10f7581c5444d0 (diff) | |
| download | nixlib-ed6e598747e5a334acfca81c475efd4e98f8f69f.tar nixlib-ed6e598747e5a334acfca81c475efd4e98f8f69f.tar.gz nixlib-ed6e598747e5a334acfca81c475efd4e98f8f69f.tar.bz2 nixlib-ed6e598747e5a334acfca81c475efd4e98f8f69f.tar.lz nixlib-ed6e598747e5a334acfca81c475efd4e98f8f69f.tar.xz nixlib-ed6e598747e5a334acfca81c475efd4e98f8f69f.tar.zst nixlib-ed6e598747e5a334acfca81c475efd4e98f8f69f.zip | |
Merge pull request #89112 from eadwu/musl/libc-arch
musl: include libc.musl-$arch
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/musl/default.nix | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix index 51dcf4cfca33..422ad5c1cb50 100644 --- a/pkgs/os-specific/linux/musl/default.nix +++ b/pkgs/os-specific/linux/musl/default.nix @@ -26,6 +26,12 @@ let sha256 = "1mzxnc2ncq8lw9x6n7p00fvfklc9p3wfv28m68j0dfz5l8q2k6pp"; }; + arch = if stdenv.hostPlatform.isx86_64 + then "x86_64" + else if stdenv.hostPlatform.isx86_32 + then "i386" + else null; + in stdenv.mkDerivation rec { pname = "musl"; @@ -102,6 +108,9 @@ stdenv.mkDerivation rec { -lc \ -B $out/lib \ -Wl,-dynamic-linker=$(ls $out/lib/ld-*) + '' + lib.optionalString (arch != null) '' + # Create 'libc.musl-$arch' symlink + ln -rs $out/lib/libc.so $out/lib/libc.musl-${arch}.so.1 '' + lib.optionalString useBSDCompatHeaders '' install -D ${queue_h} $dev/include/sys/queue.h install -D ${cdefs_h} $dev/include/sys/cdefs.h |