Skip to content

Commit

Permalink
wip
Browse files Browse the repository at this point in the history
  • Loading branch information
pshirshov committed Dec 16, 2023
1 parent 1f014ca commit 8c86663
Show file tree
Hide file tree
Showing 7 changed files with 24 additions and 15 deletions.
2 changes: 1 addition & 1 deletion default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
modules = import ./modules; # NixOS modules
overlays = import ./overlays; # nixpkgs overlays

graalvmCELegacyPackages =
graalvm-legacy-packages =
pkgs.lib.recurseIntoAttrs (pkgs.callPackage ./pkgs/graalvm-legacy { });

# graalvm11-ce = graalvmCEPackages.graalvm11-ce;
Expand Down
6 changes: 3 additions & 3 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
let
systems = [
"x86_64-linux"
"i686-linux"
"x86_64-darwin"
"aarch64-linux"
"armv6l-linux"
"armv7l-linux"
# "i686-linux"
# "x86_64-darwin"
# "aarch64-linux"
# "armv6l-linux"
# "armv7l-linux"
];
forAllSystems = f: nixpkgs.lib.genAttrs systems (system: f system);
in
Expand Down
10 changes: 8 additions & 2 deletions pkgs/graalvm-legacy/buildGraalvmProduct.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{ lib
, stdenv
, autoPatchelfHook
, graalvm-ce
, makeWrapper
, perl
, unzip
Expand Down Expand Up @@ -100,7 +99,14 @@ stdenv.mkDerivation ({
} // passthru;

meta = with lib; ({
inherit (graalvm-ce.meta) homepage license sourceProvenance maintainers platforms;
# inherit (graalvm-ce.meta) homepage license sourceProvenance maintainers platforms;
homepage = "https://www.graalvm.org/";
license = with licenses; [ upl gpl2Classpath bsd3 ];
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
mainProgram = "java";
maintainers = with maintainers; teams.graalvm-ce.members ++ [ ];
description = "High-Performance Polyglot VM (Product: ${product})";
} // meta);


} // extraArgs)
3 changes: 3 additions & 0 deletions pkgs/graalvm-legacy/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ rec {
javaVersion = "11";
version = "22.3.1";
src = fetchurl (source "llvm-installable-svm" javaVersion);

};

native-image-installable-svm-java11 = callPackage ./native-image-installable-svm.nix rec {
Expand Down Expand Up @@ -212,6 +213,7 @@ rec {
javaVersion = "19";
version = "22.3.1";
src = fetchurl (source "js-installable-svm" javaVersion);
inherit buildGraalvmProduct;
};

llvm-installable-svm-java19 = callPackage ./llvm-installable-svm.nix rec {
Expand All @@ -224,6 +226,7 @@ rec {
javaVersion = "19";
version = "22.3.1";
src = fetchurl (source "native-image-installable-svm" javaVersion);
inherit buildGraalvmProduct;
};

nodejs-installable-svm-java19 = callPackage ./nodejs-installable-svm.nix rec {
Expand Down
4 changes: 2 additions & 2 deletions pkgs/graalvm-legacy/js-installable-svm.nix
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{ lib
, stdenv
, graalvm-legacy-packages
, javaVersion
, src
, version
, buildGraalvmProduct
}:

graalvm-legacy-packages.buildGraalvmProduct rec {
buildGraalvmProduct rec {
inherit src javaVersion version;
product = "js-installable-svm";

Expand Down
4 changes: 2 additions & 2 deletions pkgs/graalvm-legacy/native-image-installable-svm.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ lib
, stdenv
, graalvm-legacy-packages
, buildGraalvmProduct
, gcc
, glibc
, javaVersion
Expand All @@ -23,7 +23,7 @@ let
musl-gcc = (writeShellScriptBin "${stdenv.hostPlatform.system}-musl-gcc" ''${lib.getDev musl}/bin/musl-gcc "$@"'');
binPath = lib.makeBinPath ([ gcc ] ++ lib.optionals useMusl [ musl-gcc ]);
in
graalvm-legacy-packages.buildGraalvmProduct rec {
buildGraalvmProduct rec {
inherit src javaVersion version;
product = "native-image-installable-svm";

Expand Down

0 comments on commit 8c86663

Please sign in to comment.