From 24f9dcd06b1d3d016cb4bc5cd5aa587fee680014 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Mon, 27 Dec 2021 19:49:52 -0300 Subject: [PATCH 1/2] buildGraalvmNativeImage: fix meta --- .../build-support/build-graalvm-native-image/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/build-graalvm-native-image/default.nix b/pkgs/build-support/build-graalvm-native-image/default.nix index 0ed8ea0486b6..09b2d9f73a2b 100644 --- a/pkgs/build-support/build-graalvm-native-image/default.nix +++ b/pkgs/build-support/build-graalvm-native-image/default.nix @@ -21,6 +21,7 @@ , graalvmXmx ? "-J-Xmx6g" # The GraalVM to use , graalvm ? graalvmCEPackages.graalvm11-ce +, meta ? { } , ... } @ args: @@ -47,6 +48,10 @@ stdenv.mkDerivation (args // { runHook postInstall ''; - meta.platforms = lib.attrByPath [ "meta" "platforms" ] graalvm.meta.platforms args; - meta.mainProgram = lib.attrByPath [ "meta" "mainProgram" ] executable args; + meta = { + # default to graalvm's platforms + platforms = graalvm.meta.platforms; + # default to executable name + mainProgram = executable; + } // meta; }) From 34b93d2007a523578e20dc7a6fc7d21da577eec5 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Mon, 27 Dec 2021 19:59:34 -0300 Subject: [PATCH 2/2] clj-kondo: fix typo --- pkgs/development/tools/clj-kondo/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/clj-kondo/default.nix b/pkgs/development/tools/clj-kondo/default.nix index bd6848c8be74..8a71939f2c11 100644 --- a/pkgs/development/tools/clj-kondo/default.nix +++ b/pkgs/development/tools/clj-kondo/default.nix @@ -18,7 +18,7 @@ buildGraalvmNativeImage rec { description = "A linter for Clojure code that sparks joy"; homepage = "https://github.com/clj-kondo/clj-kondo"; license = licenses.epl10; - changelog = "https://github.com/clj-kondo/clj-kondo/blob/v${versiont}/CHANGELOG.md"; + changelog = "https://github.com/clj-kondo/clj-kondo/blob/v${version}/CHANGELOG.md"; maintainers = with maintainers; [ jlesquembre bandresen thiagokokada ]; }; }