nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-15 02:03:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

native-image-installable-svm: move it to its own file

Browse Source
This commit is contained in:
Thiago Kenji Okada 2023-02-09 22:12:36 +00:00
parent 256195c07a
commit 58bfc885bf
3 changed files with 48 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/compilers/graalvm/community-edition/buildGraalvmProduct.nix
View File

@ -8,6 +8,7 @@
}:
{ product
, javaVersion
, extraNativeBuildInputs ? [ ]
, extraBuildInputs ? [ ]
, meta ? { }
, passthru ? { }
@ -17,7 +18,8 @@ stdenv.mkDerivation (args // {
pname = "${product}-java${javaVersion}";
nativeBuildInputs = [ perl unzip makeWrapper ]
++ lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook;
++ lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook
++ extraNativeBuildInputs;
buildInputs = [
stdenv.cc.cc.lib # libstdc++.so.6
@ -45,8 +47,6 @@ stdenv.mkDerivation (args // {
rm -rf "$out/META-INF"
}
mkdir -p "$out"
unpack_jar "$src"
runHook postUnpack

56
pkgs/development/compilers/graalvm/community-edition/default.nix
View File

@ -13,6 +13,8 @@ let
sources = javaVersion: builtins.fromJSON (builtins.readFile (./. + "/graalvm${javaVersion}-ce-sources.json"));
in
rec {
inherit buildGraalvm buildGraalvmProduct;
graalvm11-ce = buildGraalvm rec {
version = "22.3.0";
javaVersion = "11";
@ -21,32 +23,10 @@ rec {
products = [ native-image-installable-svm-java11 ];
};
native-image-installable-svm-java11 = buildGraalvmProduct rec {
product = "native-image-installable-svm";
native-image-installable-svm-java11 = callPackage ./native-image-installable-svm.nix rec {
javaVersion = "11";
version = "22.3.0";
src = fetchurl (sources javaVersion).${stdenv.system}.${"${product}|java${javaVersion}|${version}"};
postInstall = lib.optionalString stdenv.isLinux ''
wrapProgram $out/bin/native-image \
--prefix PATH : ${lib.makeBinPath [ gcc ]} \
${lib.concatStringsSep " "
(map (l: "--add-flags '-H:CLibraryPath=${l}/lib'") [ glibc glibc.static zlib.static ])}
'';
installCheckPhase = ''
echo "Ahead-Of-Time compilation"
$out/bin/native-image -H:-CheckToolchain -H:+ReportExceptionStackTraces HelloWorld
./helloworld | fgrep 'Hello World'
${lib.optionalString stdenv.isLinux ''
echo "Ahead-Of-Time compilation with -H:+StaticExecutableWithDynamicLibC"
$out/bin/native-image -H:+StaticExecutableWithDynamicLibC HelloWorld
./helloworld | fgrep 'Hello World'
echo "Ahead-Of-Time compilation with --static"
$out/bin/native-image --static HelloWorld
./helloworld | fgrep 'Hello World'
''}
'';
src = fetchurl (sources javaVersion).${stdenv.system}.${"native-image-installable-svm|java${javaVersion}|${version}"};
};
graalvm17-ce = buildGraalvm rec {
@ -54,34 +34,12 @@ rec {
javaVersion = "17";
src = fetchurl (sources javaVersion).${stdenv.system}.${"graalvm-ce|java${javaVersion}|${version}"};
meta.platforms = builtins.attrNames (sources javaVersion);
products = [ native-image-installable-svm-java11 ];
products = [ native-image-installable-svm-java17 ];
};
native-image-installable-svm-java17 = buildGraalvmProduct rec {
product = "native-image-installable-svm";
native-image-installable-svm-java17 = callPackage ./native-image-installable-svm.nix rec {
javaVersion = "17";
version = "22.3.0";
src = fetchurl (sources javaVersion).${stdenv.system}.${"${product}|java${javaVersion}|${version}"};
postInstall = lib.optionalString stdenv.isLinux ''
wrapProgram $out/bin/native-image \
--prefix PATH : ${lib.makeBinPath [ gcc ]} \
${lib.concatStringsSep " "
(map (l: "--add-flags '-H:CLibraryPath=${l}/lib'") [ glibc glibc.static zlib.static ])}
'';
installCheckPhase = ''
echo "Ahead-Of-Time compilation"
$out/bin/native-image -H:-CheckToolchain -H:+ReportExceptionStackTraces HelloWorld
./helloworld | fgrep 'Hello World'
${lib.optionalString stdenv.isLinux ''
echo "Ahead-Of-Time compilation with -H:+StaticExecutableWithDynamicLibC"
$out/bin/native-image -H:+StaticExecutableWithDynamicLibC HelloWorld
./helloworld | fgrep 'Hello World'
echo "Ahead-Of-Time compilation with --static"
$out/bin/native-image --static HelloWorld
./helloworld | fgrep 'Hello World'
''}
'';
src = fetchurl (sources javaVersion).${stdenv.system}.${"native-image-installable-svm|java${javaVersion}|${version}"};
};
}

38
pkgs/development/compilers/graalvm/community-edition/native-image-installable-svm.nix Normal file
View File

@ -0,0 +1,38 @@
{ lib
, stdenv
, graalvmCEPackages
, gcc
, glibc
, javaVersion
, src
, version
, zlib
}:
graalvmCEPackages.buildGraalvmProduct rec {
inherit src javaVersion version;
product = "native-image-installable-svm";
postInstall = lib.optionalString stdenv.isLinux ''
wrapProgram $out/bin/native-image \
--prefix PATH : ${lib.makeBinPath [ gcc ]} \
${lib.concatStringsSep " "
(map (l: "--add-flags '-H:CLibraryPath=${l}/lib'") [ glibc glibc.static zlib.static ])}
'';
installCheckPhase = ''
echo "Ahead-Of-Time compilation"
$out/bin/native-image -H:-CheckToolchain -H:+ReportExceptionStackTraces HelloWorld
./helloworld | fgrep 'Hello World'
${lib.optionalString stdenv.isLinux ''
echo "Ahead-Of-Time compilation with -H:+StaticExecutableWithDynamicLibC"
$out/bin/native-image -H:+StaticExecutableWithDynamicLibC HelloWorld
./helloworld | fgrep 'Hello World'
echo "Ahead-Of-Time compilation with --static"
$out/bin/native-image --static HelloWorld
./helloworld | fgrep 'Hello World'
''}
'';
}