diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-04-01 12:01:21 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-01 12:01:21 +0000 |
| commit | 50497647fa598a98167dc1c1ef72c55dd3f07e59 (patch) | |
| tree | 0c0f4922936b08b476a9b874f05ff8fa5efd7254 /pkgs/build-support | |
| parent | 5e1c018e60b263e7b363a2d9215e4c70aa1fdcdf (diff) | |
| parent | e741da0bc838a40f81ff48c0eb491932468cc563 (diff) | |
| download | nixpkgs-50497647fa598a98167dc1c1ef72c55dd3f07e59.tar nixpkgs-50497647fa598a98167dc1c1ef72c55dd3f07e59.tar.gz nixpkgs-50497647fa598a98167dc1c1ef72c55dd3f07e59.tar.bz2 nixpkgs-50497647fa598a98167dc1c1ef72c55dd3f07e59.tar.lz nixpkgs-50497647fa598a98167dc1c1ef72c55dd3f07e59.tar.xz nixpkgs-50497647fa598a98167dc1c1ef72c55dd3f07e59.tar.zst nixpkgs-50497647fa598a98167dc1c1ef72c55dd3f07e59.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/build-graalvm-native-image/default.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/build-support/build-graalvm-native-image/default.nix b/pkgs/build-support/build-graalvm-native-image/default.nix index 3aedd61ea6c..d34f562bc53 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, graalvmCEPackages, glibcLocales }: +{ lib, stdenv, graalvm, glibcLocales }: { name ? "${args.pname}-${args.version}" # Final executable name @@ -19,8 +19,8 @@ , extraNativeImageBuildArgs ? [ ] # XMX size of GraalVM during build , graalvmXmx ? "-J-Xmx6g" - # The GraalVM to use -, graalvm ? graalvmCEPackages.graalvm11-ce + # The GraalVM derivation to use +, graalvmDrv ? graalvm , meta ? { } , ... } @ args: @@ -28,7 +28,7 @@ stdenv.mkDerivation (args // { inherit dontUnpack; - nativeBuildInputs = (args.nativeBuildInputs or [ ]) ++ [ graalvm glibcLocales ]; + nativeBuildInputs = (args.nativeBuildInputs or [ ]) ++ [ graalvmDrv glibcLocales ]; nativeImageBuildArgs = nativeImageBuildArgs ++ extraNativeImageBuildArgs ++ [ graalvmXmx ]; @@ -52,7 +52,7 @@ stdenv.mkDerivation (args // { meta = { # default to graalvm's platforms - platforms = graalvm.meta.platforms; + platforms = graalvmDrv.meta.platforms; # default to executable name mainProgram = executable; } // meta; |