From 248449fbdf50e60cc38a52c243e3d68bb3efcb66 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 14 Feb 2023 17:00:45 +0000 Subject: [PATCH] graalvmCEPackages: formatting --- .../compilers/graalvm/community-edition/buildGraalvm.nix | 6 ++++-- .../graalvm/community-edition/buildGraalvmProduct.nix | 3 ++- .../community-edition/native-image-installable-svm.nix | 6 ++++-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix b/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix index a7d824f87972..3111fea1b400 100644 --- a/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix +++ b/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix @@ -18,7 +18,8 @@ { javaVersion , meta ? { } , products ? [ ] -, ... } @ args: +, ... +} @ args: let runtimeLibraryPath = lib.makeLibraryPath @@ -150,4 +151,5 @@ let maintainers = with maintainers; teams.graalvm-ce.members ++ [ ]; } // meta); } // (builtins.removeAttrs args [ "javaVersion" "meta" "products" ])); -in graalvmXXX-ce +in +graalvmXXX-ce diff --git a/pkgs/development/compilers/graalvm/community-edition/buildGraalvmProduct.nix b/pkgs/development/compilers/graalvm/community-edition/buildGraalvmProduct.nix index de1f75249e47..52cf6e7e89e9 100644 --- a/pkgs/development/compilers/graalvm/community-edition/buildGraalvmProduct.nix +++ b/pkgs/development/compilers/graalvm/community-edition/buildGraalvmProduct.nix @@ -14,7 +14,8 @@ , graalvmPhases ? { } , meta ? { } , passthru ? { } -, ... } @ args: +, ... +} @ args: stdenv.mkDerivation ({ pname = "${product}-java${javaVersion}"; diff --git a/pkgs/development/compilers/graalvm/community-edition/native-image-installable-svm.nix b/pkgs/development/compilers/graalvm/community-edition/native-image-installable-svm.nix index 6d1c58d4b114..427c5ffef5b5 100644 --- a/pkgs/development/compilers/graalvm/community-edition/native-image-installable-svm.nix +++ b/pkgs/development/compilers/graalvm/community-edition/native-image-installable-svm.nix @@ -39,7 +39,8 @@ graalvmCEPackages.buildGraalvmProduct rec { $out/bin/native-image -H:-CheckToolchain -H:+ReportExceptionStackTraces HelloWorld ./helloworld | fgrep 'Hello World' - ${lib.optionalString (stdenv.isLinux && !useMusl) '' + ${# --static is only available in Linux + lib.optionalString (stdenv.isLinux && !useMusl) '' echo "Ahead-Of-Time compilation with -H:+StaticExecutableWithDynamicLibC" $out/bin/native-image -H:+StaticExecutableWithDynamicLibC HelloWorld ./helloworld | fgrep 'Hello World' @@ -49,7 +50,8 @@ graalvmCEPackages.buildGraalvmProduct rec { ./helloworld | fgrep 'Hello World' ''} - ${lib.optionalString (stdenv.isLinux && useMusl) '' + ${# --static is only available in Linux + lib.optionalString (stdenv.isLinux && useMusl) '' echo "Ahead-Of-Time compilation with --static and --libc=musl" $out/bin/native-image --static HelloWorld --libc=musl ./helloworld | fgrep 'Hello World'