diff options
| author | Thiago Kenji Okada <thiagokokada@gmail.com> | 2021-11-23 12:35:55 -0300 |
|---|---|---|
| committer | Thiago Kenji Okada <thiagokokada@gmail.com> | 2021-11-24 10:37:32 -0300 |
| commit | d352856ea2148e4ec1de2b5769dfcf79c1356d99 (patch) | |
| tree | d2f53dd7601b40a43665465ce26472708e9b9a9b /pkgs | |
| parent | 3100248dbb4b47c5b4f9fbc836feab46bed87e37 (diff) | |
buildGraalvmNativeImage: default executable to pname
Diffstat (limited to 'pkgs')
4 files changed, 3 insertions, 9 deletions
diff --git a/pkgs/build-support/build-graalvm-native-image/default.nix b/pkgs/build-support/build-graalvm-native-image/default.nix index d6c07f0d69d76..082787498e498 100644 --- a/pkgs/build-support/build-graalvm-native-image/default.nix +++ b/pkgs/build-support/build-graalvm-native-image/default.nix @@ -2,7 +2,7 @@ { name ? "${args.pname}-${args.version}" # Final executable name -, executable +, executable ? args.pname # JAR used as input for GraalVM derivation, defaults to src , jar ? args.src , dontUnpack ? (jar == args.src) diff --git a/pkgs/development/tools/clj-kondo/default.nix b/pkgs/development/tools/clj-kondo/default.nix index efb97513a3004..22a4582c5bb74 100644 --- a/pkgs/development/tools/clj-kondo/default.nix +++ b/pkgs/development/tools/clj-kondo/default.nix @@ -9,8 +9,6 @@ buildGraalvmNativeImage rec { sha256 = "sha256-i0OeQPZfQPUeXC/Bs84I91IahBKK6W1mFix97s8/lVA="; }; - executable = "clj-kondo"; - extraNativeImageBuildArgs = [ "-H:+ReportExceptionStackTraces" "--verbose" diff --git a/pkgs/development/tools/jet/default.nix b/pkgs/development/tools/jet/default.nix index 07855f8eabe5c..9713a736cd3c7 100644 --- a/pkgs/development/tools/jet/default.nix +++ b/pkgs/development/tools/jet/default.nix @@ -14,8 +14,6 @@ buildGraalvmNativeImage rec { sha256 = "sha256-mOUiKEM5tYhtpBpm7KtslyPYFsJ+Wr+4ul6Zi4aS09Q="; }; - executable = "jet"; - extraNativeImageBuildArgs = [ "-H:+ReportExceptionStackTraces" "-J-Dclojure.spec.skip-macros=true" diff --git a/pkgs/development/tools/misc/clojure-lsp/default.nix b/pkgs/development/tools/misc/clojure-lsp/default.nix index c36f1695702d2..5dd0f4a9e2903 100644 --- a/pkgs/development/tools/misc/clojure-lsp/default.nix +++ b/pkgs/development/tools/misc/clojure-lsp/default.nix @@ -16,8 +16,6 @@ buildGraalvmNativeImage rec { sha256 = "sha256-k0mzibcLAspklCPE6f2qsUm9bwSvcJRgWecMBq7mpF0="; }; - executable = "clojure-lsp"; - # https://github.com/clojure-lsp/clojure-lsp/blob/2021.11.02-15.24.47/graalvm/native-unix-compile.sh#L18-L27 DTLV_LIB_EXTRACT_DIR = "/tmp"; @@ -33,8 +31,8 @@ buildGraalvmNativeImage rec { runHook preCheck export HOME="$(mktemp -d)" - ./${executable} --version | fgrep -q '${version}' - ${babashka}/bin/bb integration-test ./${executable} + ./${pname} --version | fgrep -q '${version}' + ${babashka}/bin/bb integration-test ./${pname} runHook postCheck ''; |