Commit 2fea2459 authored by Thiago Kenji Okada's avatar Thiago Kenji Okada
Browse files

buildGraalvm: use macOS SDK 11 

Fix x86_64-darwin builds.
parent a98e9f48

pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix

+11 −5
Original line number Diff line number Diff line
@@ -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