From d2e047f112b459dc2ded9923c388370c893520ae Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Sun, 12 Feb 2023 14:47:13 +0000 Subject: [PATCH] graalvm-ce: add it to all-packages pointing to graalvm11-ce --- pkgs/build-support/build-graalvm-native-image/default.nix | 4 ++-- .../compilers/graalvm/community-edition/update.sh | 2 +- pkgs/top-level/all-packages.nix | 5 ++--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/build-support/build-graalvm-native-image/default.nix b/pkgs/build-support/build-graalvm-native-image/default.nix index be11d06308a..810ef52235e 100644 --- a/pkgs/build-support/build-graalvm-native-image/default.nix +++ b/pkgs/build-support/build-graalvm-native-image/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, graalvm, glibcLocales }: +{ lib, stdenv, graalvm-ce, glibcLocales }: { name ? "${args.pname}-${args.version}" # Final executable name @@ -19,7 +19,7 @@ # XMX size of GraalVM during build , graalvmXmx ? "-J-Xmx6g" # The GraalVM derivation to use -, graalvmDrv ? graalvm +, graalvmDrv ? graalvm-ce # Locale to be used by GraalVM compiler , LC_ALL ? "en_US.UTF-8" , meta ? { } diff --git a/pkgs/development/compilers/graalvm/community-edition/update.sh b/pkgs/development/compilers/graalvm/community-edition/update.sh index 6121df8a7c9..476bd754ad5 100755 --- a/pkgs/development/compilers/graalvm/community-edition/update.sh +++ b/pkgs/development/compilers/graalvm/community-edition/update.sh @@ -16,7 +16,7 @@ verlte() { readonly nixpkgs=../../../../.. -readonly current_version="$(nix-instantiate "$nixpkgs" --eval --strict -A graalvm11-ce.version | tr -d \")" +readonly current_version="$(nix-instantiate "$nixpkgs" --eval --strict -A graalvm-ce.version | tr -d \")" if [[ -z "${1:-}" ]]; then readonly gh_version="$(curl \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 24181c42414..ccd4642b80f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14988,11 +14988,10 @@ with pkgs; recurseIntoAttrs (callPackage ../development/compilers/graalvm/community-edition { inherit (darwin.apple_sdk.frameworks) Foundation; }); + graalvm-ce = graalvm11-ce; graalvm11-ce = graalvmCEPackages.graalvm11-ce; graalvm17-ce = graalvmCEPackages.graalvm17-ce; - buildGraalvmNativeImage = callPackage ../build-support/build-graalvm-native-image { - graalvm = graalvm11-ce; - }; + buildGraalvmNativeImage = callPackage ../build-support/build-graalvm-native-image { }; openshot-qt = libsForQt5.callPackage ../applications/video/openshot-qt { };