colin
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

buildGraalvm: use macOS SDK 11 

Fix x86_64-darwin builds.
This commit is contained in:
Thiago Kenji Okada 2024-03-26 14:12:31 +00:00
parent a98e9f4892
commit 2fea245936
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix
View File

@ -51,7 +51,13 @@ let
"meta"
];
cLibs = lib.optionals stdenv.isLinux (
stdenv' =
if stdenv.isDarwin then
darwin.apple_sdk_11_0.stdenv
else
stdenv;
cLibs = lib.optionals stdenv'.isLinux (
[ glibc zlib.static ]
++ lib.optionals (!useMusl) [ glibc.static ]
++ lib.optionals useMusl [ musl ]
@ -61,14 +67,14 @@ let
# GraalVM 21.3.0+ expects musl-gcc as <system>-musl-gcc
musl-gcc = (runCommandCC "musl-gcc" { } ''
mkdir -p $out/bin
ln -s ${lib.getDev musl}/bin/musl-gcc $out/bin/${stdenv.hostPlatform.system}-musl-gcc
ln -s ${lib.getDev musl}/bin/musl-gcc $out/bin/${stdenv'.hostPlatform.system}-musl-gcc
'');
binPath = lib.makeBinPath (lib.optionals useMusl [ musl-gcc ] ++ [ stdenv.cc ]);
binPath = lib.makeBinPath (lib.optionals useMusl [ musl-gcc ] ++ [ stdenv'.cc ]);
runtimeLibraryPath = lib.makeLibraryPath
([ cups ] ++ lib.optionals gtkSupport [ cairo glib gtk3 ]);
graalvm-ce = stdenv.mkDerivation ({
graalvm-ce = stdenv'.mkDerivation ({
pname = "graalvm-ce";
unpackPhase = ''
@ -107,7 +113,7 @@ let
++ lib.optional stdenv.isLinux autoPatchelfHook;
propagatedBuildInputs = [ setJavaClassPath zlib ]
++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Foundation;
++ lib.optional stdenv.isDarwin darwin.apple_sdk_11_0.frameworks.Foundation;
buildInputs = lib.optionals stdenv.isLinux [
alsa-lib # libasound.so wanted by lib/libjsound.so