diff options
| author | Thiago Kenji Okada <thiagokokada@gmail.com> | 2024-03-26 14:12:31 +0000 |
|---|---|---|
| committer | Thiago Kenji Okada <thiagokokada@gmail.com> | 2024-03-26 14:45:17 +0000 |
| commit | 2fea2459368625067a730446fbd97f2ea8744042 (patch) | |
| tree | b4acaa3487d48e41268bbd7bb88feea2d91ae652 /pkgs/development | |
| parent | a98e9f4892660c164b910461dad1abd734382736 (diff) | |
buildGraalvm: use macOS SDK 11
Fix x86_64-darwin builds.
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix b/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix index 99e1a053769de..0e899a0a17d56 100644 --- a/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix +++ b/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix @@ -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 |