dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #89112 from eadwu/musl/libc-arch

Browse Source 
musl: include libc.musl-$arch
This commit is contained in:
Matthew Bauer 2020-06-12 14:29:22 -05:00 committed by GitHub
commit ed6e598747
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/os-specific/linux/musl/default.nix
View File

@ -26,6 +26,12 @@ let
sha256 = "1mzxnc2ncq8lw9x6n7p00fvfklc9p3wfv28m68j0dfz5l8q2k6pp"; sha256 = "1mzxnc2ncq8lw9x6n7p00fvfklc9p3wfv28m68j0dfz5l8q2k6pp";
}; };
arch = if stdenv.hostPlatform.isx86_64
then "x86_64"
else if stdenv.hostPlatform.isx86_32
then "i386"
else null;
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "musl"; pname = "musl";
@ -102,6 +108,9 @@ stdenv.mkDerivation rec {
-lc \ -lc \
-B $out/lib \ -B $out/lib \
-Wl,-dynamic-linker=$(ls $out/lib/ld-*) -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 '' '' + lib.optionalString useBSDCompatHeaders ''
install -D ${queue_h} $dev/include/sys/queue.h install -D ${queue_h} $dev/include/sys/queue.h
install -D ${cdefs_h} $dev/include/sys/cdefs.h install -D ${cdefs_h} $dev/include/sys/cdefs.h