From 8fcfb1d95c419a9e02ec75ff8ddc25ec623723cb Mon Sep 17 00:00:00 2001 From: James Conroy-Finn Date: Thu, 23 Nov 2023 11:57:31 +0000 Subject: [PATCH] clj-kondo: Remove references to GraalVM derivation https://github.com/NixOS/nixpkgs/issues/269029 --- pkgs/development/tools/clj-kondo/default.nix | 23 ++++++++++++++------ 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/clj-kondo/default.nix b/pkgs/development/tools/clj-kondo/default.nix index dc78761cc256..a60de4d83ea8 100644 --- a/pkgs/development/tools/clj-kondo/default.nix +++ b/pkgs/development/tools/clj-kondo/default.nix @@ -1,25 +1,34 @@ -{ lib, buildGraalvmNativeImage, fetchurl }: +{ lib, buildGraalvmNativeImage, graalvmCEPackages, removeReferencesTo, fetchurl +}: buildGraalvmNativeImage rec { pname = "clj-kondo"; version = "2023.10.20"; src = fetchurl { - url = "https://github.com/clj-kondo/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; + url = + "https://github.com/clj-kondo/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; sha256 = "sha256-f9u/pk3CEEmiLgnS2biaUHpsMHjVEwZL2jyB/1PiZUY="; }; - extraNativeImageBuildArgs = [ - "-H:+ReportExceptionStackTraces" - "--no-fallback" - ]; + graalvmDrv = graalvmCEPackages.graalvm-ce; + + nativeBuildInputs = [ removeReferencesTo ]; + + extraNativeImageBuildArgs = + [ "-H:+ReportExceptionStackTraces" "--no-fallback" ]; + + postInstall = '' + remove-references-to -t ${graalvmDrv} $out/bin/${pname} + ''; meta = with lib; { description = "A linter for Clojure code that sparks joy"; homepage = "https://github.com/clj-kondo/clj-kondo"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.epl10; - changelog = "https://github.com/clj-kondo/clj-kondo/blob/v${version}/CHANGELOG.md"; + changelog = + "https://github.com/clj-kondo/clj-kondo/blob/v${version}/CHANGELOG.md"; maintainers = with maintainers; [ jlesquembre bandresen thiagokokada ]; }; }