b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #166718 from thiagokokada/add-graalvmDrv

Browse source 
buildGraalvmNativeImage: allow usage of arbitrary graalvm derivation
This commit is contained in:
Thiago Kenji Okada 2022-04-01 08:19:43 +01:00 committed by GitHub
parent a44b35dc41 5e7759bd9d
commit d9448bd7d9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/applications/misc/HentaiAtHome/default.nix
View file

@ -13,7 +13,7 @@ buildGraalvmNativeImage rec {
jar = "${src}/HentaiAtHome.jar";
dontUnpack = true;
graalvm = graalvm17-ce;
graalvmDrv = graalvm17-ce;
extraNativeImageBuildArgs = [
"--enable-url-protocols=http,https"
"--install-exit-handlers"

10
pkgs/build-support/build-graalvm-native-image/default.nix
View file

@ -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;

4
pkgs/top-level/all-packages.nix
View file

@ -12866,7 +12866,9 @@ with pkgs;
});
graalvm11-ce = graalvmCEPackages.graalvm11-ce;
graalvm17-ce = graalvmCEPackages.graalvm17-ce;
buildGraalvmNativeImage = callPackage ../build-support/build-graalvm-native-image { };
buildGraalvmNativeImage = callPackage ../build-support/build-graalvm-native-image {
graalvm = graalvm11-ce;
};
inherit (callPackages ../development/compilers/graalvm/enterprise-edition.nix { })
graalvm8-ee