summary refs log tree commit diff
diff options
context:
space:
mode:
authorThiago Kenji Okada <thiagokokada@gmail.com>2021-11-23 13:32:17 -0300
committerThiago Kenji Okada <thiagokokada@gmail.com>2021-11-24 10:37:33 -0300
commitf1c16183c8c7c78a3f372251e9af0f465d0bb355 (patch)
tree6fc5f1ea69cf1a2a223302863b0995bb548c3a75
parente9766a85bdf15c525bdcb5b16040608ff7b9233f (diff)
downloadnixpkgs-f1c16183c8c7c78a3f372251e9af0f465d0bb355.tar
nixpkgs-f1c16183c8c7c78a3f372251e9af0f465d0bb355.tar.gz
nixpkgs-f1c16183c8c7c78a3f372251e9af0f465d0bb355.tar.bz2
nixpkgs-f1c16183c8c7c78a3f372251e9af0f465d0bb355.tar.lz
nixpkgs-f1c16183c8c7c78a3f372251e9af0f465d0bb355.tar.xz
nixpkgs-f1c16183c8c7c78a3f372251e9af0f465d0bb355.tar.zst
nixpkgs-f1c16183c8c7c78a3f372251e9af0f465d0bb355.zip
buildGraalvmNativeImage: fix meta, add --verbose flag
-rw-r--r--pkgs/build-support/build-graalvm-native-image/default.nix7
-rw-r--r--pkgs/development/interpreters/clojure/babashka.nix1
-rw-r--r--pkgs/development/tools/clj-kondo/default.nix1
-rw-r--r--pkgs/development/tools/jet/default.nix1
-rw-r--r--pkgs/development/tools/misc/clojure-lsp/default.nix1
5 files changed, 3 insertions, 8 deletions
diff --git a/pkgs/build-support/build-graalvm-native-image/default.nix b/pkgs/build-support/build-graalvm-native-image/default.nix
index 082787498e4..d85a5c45774 100644
--- a/pkgs/build-support/build-graalvm-native-image/default.nix
+++ b/pkgs/build-support/build-graalvm-native-image/default.nix
@@ -26,6 +26,7 @@ stdenv.mkDerivation (args // {
     "-H:CLibraryPath=${lib.getLib graalvm}/lib"
     "${lib.optionalString stdenv.isDarwin "-H:-CheckToolchain"}"
     "-H:Name=${executable}"
+    "--verbose"
     extraNativeImageBuildArgs
     graalvmXmx
   ]);
@@ -46,8 +47,6 @@ stdenv.mkDerivation (args // {
     runHook postInstall
   '';
 
-  meta = {
-    platforms = lib.attrByPath [ "meta" "platforms" ] graalvm.meta.platforms args;
-    mainProgram = lib.attrByPath [ "meta" "mainProgram" ] executable args;
-  };
+  meta.platforms = lib.attrByPath [ "meta" "platforms" ] graalvm.meta.platforms args;
+  meta.mainProgram = lib.attrByPath [ "meta" "mainProgram" ] executable args;
 })
diff --git a/pkgs/development/interpreters/clojure/babashka.nix b/pkgs/development/interpreters/clojure/babashka.nix
index acd7eccaadf..5e7731b6903 100644
--- a/pkgs/development/interpreters/clojure/babashka.nix
+++ b/pkgs/development/interpreters/clojure/babashka.nix
@@ -13,7 +13,6 @@ buildGraalvmNativeImage rec {
 
   extraNativeImageBuildArgs = [
     "-H:+ReportExceptionStackTraces"
-    "--verbose"
     "--no-fallback"
     "--native-image-info"
   ];
diff --git a/pkgs/development/tools/clj-kondo/default.nix b/pkgs/development/tools/clj-kondo/default.nix
index 22a4582c5bb..df6a5e0f90e 100644
--- a/pkgs/development/tools/clj-kondo/default.nix
+++ b/pkgs/development/tools/clj-kondo/default.nix
@@ -11,7 +11,6 @@ buildGraalvmNativeImage rec {
 
   extraNativeImageBuildArgs = [
     "-H:+ReportExceptionStackTraces"
-    "--verbose"
     "--no-fallback"
   ];
 
diff --git a/pkgs/development/tools/jet/default.nix b/pkgs/development/tools/jet/default.nix
index 9713a736cd3..6e140620adc 100644
--- a/pkgs/development/tools/jet/default.nix
+++ b/pkgs/development/tools/jet/default.nix
@@ -22,7 +22,6 @@ buildGraalvmNativeImage rec {
     "-H:ReflectionConfigurationFiles=${reflectionJson}"
     "--initialize-at-build-time"
     "-H:Log=registerResource:"
-    "--verbose"
     "--no-fallback"
     "--no-server"
   ];
diff --git a/pkgs/development/tools/misc/clojure-lsp/default.nix b/pkgs/development/tools/misc/clojure-lsp/default.nix
index 5dd0f4a9e29..5e3c750852d 100644
--- a/pkgs/development/tools/misc/clojure-lsp/default.nix
+++ b/pkgs/development/tools/misc/clojure-lsp/default.nix
@@ -21,7 +21,6 @@ buildGraalvmNativeImage rec {
 
   extraNativeImageBuildArgs = [
     "-H:CLibraryPath=${DTLV_LIB_EXTRACT_DIR}"
-    "--verbose"
     "--no-fallback"
     "--native-image-info"
   ];