From 158b0e037f175cd3a93ed5766be8cc4d10f4b3ef Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Fri, 15 Apr 2022 20:49:29 +0100 Subject: [PATCH] graalvm17-ce: re-enable it on aarch64-linux However without support for Native Image, since it is failing to build. --- .../graalvm/community-edition/default.nix | 14 +++++++++----- .../community-edition/graalvm17-ce-sources.json | 6 ++++++ 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/graalvm/community-edition/default.nix b/pkgs/development/compilers/graalvm/community-edition/default.nix index b4448cda9c39..32b77d0f6e1e 100644 --- a/pkgs/development/compilers/graalvm/community-edition/default.nix +++ b/pkgs/development/compilers/graalvm/community-edition/default.nix @@ -52,11 +52,6 @@ in platforms = builtins.attrNames config; }; - # TODO: fix aarch64-linux, failing during Native Image compilation - # "Caused by: java.io.IOException: Cannot run program - # "/nix/store/1q1mif7h3lgxdaxg6j39hli5azikrfla-gcc-wrapper-9.3.0/bin/gcc" (in - # directory"/tmp/SVM-4194439592488143713"): error=0, Failed to exec spawn - # helper: pid: 19865, exit value: 1" graalvm17-ce = mkGraal rec { config = { x86_64-darwin = { @@ -72,6 +67,15 @@ in arch = "darwin-aarch64"; version = graalvm17-ce-dev-version; }; + aarch64-linux = { + # TODO: error with native-image-installable-svm in aarch64-linux: + # "Caused by: java.io.IOException: Cannot run program + # "/nix/store/00000000000000000000000000000000-gcc-wrapper-9.3.0/bin/gcc" (in + # directory"/tmp/SVM-0000000000000000000"): error=0, Failed to exec spawn + # helper: pid: 19865, exit value: 1" + products = [ "graalvm-ce" ]; + arch = "linux-aarch64"; + }; }; defaultVersion = graalvm17-ce-release-version; javaVersion = "17"; diff --git a/pkgs/development/compilers/graalvm/community-edition/graalvm17-ce-sources.json b/pkgs/development/compilers/graalvm/community-edition/graalvm17-ce-sources.json index 861f5e454e27..475c0feb050b 100644 --- a/pkgs/development/compilers/graalvm/community-edition/graalvm17-ce-sources.json +++ b/pkgs/development/compilers/graalvm/community-edition/graalvm17-ce-sources.json @@ -19,6 +19,12 @@ "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.0.0.2/native-image-installable-svm-java17-darwin-amd64-22.0.0.2.jar" } }, + "linux-aarch64": { + "graalvm-ce|java17|22.0.0.2": { + "sha256": "c7d78387d2a144944f26773697c1b61d3478a081a1c5e7fc20f47f1f5f3c82c7", + "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.0.0.2/graalvm-ce-java17-linux-aarch64-22.0.0.2.tar.gz" + } + }, "linux-amd64": { "graalvm-ce|java17|22.0.0.2": { "sha256": "4f743e0ed3d974b7d619ca2ed6014554e8c12e5ebbb38b9bc9e820b182169bd4",