diff options
| author | Alyssa Ross <hi@alyssa.is> | 2022-04-02 16:45:48 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2022-04-02 16:45:48 +0000 |
| commit | 8ba23e138d9714bf309facf0003d69b1f8b86265 (patch) | |
| tree | 9412925f611693a9a3ff880c10392b3763eafecb /pkgs/build-support | |
| parent | 040d8929bd4548fd0e2969476eb227f920ae06b8 (diff) | |
| parent | 66754ae952bb2ffd16e793f4be00ffecb9253e28 (diff) | |
| download | nixpkgs-8ba23e138d9714bf309facf0003d69b1f8b86265.tar nixpkgs-8ba23e138d9714bf309facf0003d69b1f8b86265.tar.gz nixpkgs-8ba23e138d9714bf309facf0003d69b1f8b86265.tar.bz2 nixpkgs-8ba23e138d9714bf309facf0003d69b1f8b86265.tar.lz nixpkgs-8ba23e138d9714bf309facf0003d69b1f8b86265.tar.xz nixpkgs-8ba23e138d9714bf309facf0003d69b1f8b86265.tar.zst nixpkgs-8ba23e138d9714bf309facf0003d69b1f8b86265.zip | |
Merge remote-tracking branch 'nixpkgs/staging-next' into staging
Conflicts: pkgs/development/libraries/zlib/default.nix pkgs/development/lua-modules/overrides.nix
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; |