From 1b5a054e0a45066bbf2272340d907ca2920f2ed6 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 20 Jun 2023 09:32:11 +0300 Subject: [PATCH] jd-cli: convert to mavenfod --- pkgs/tools/security/jd-cli/default.nix | 35 +++----------------------- 1 file changed, 3 insertions(+), 32 deletions(-) diff --git a/pkgs/tools/security/jd-cli/default.nix b/pkgs/tools/security/jd-cli/default.nix index c57230bbd5a..84aa6018204 100644 --- a/pkgs/tools/security/jd-cli/default.nix +++ b/pkgs/tools/security/jd-cli/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, jre, makeWrapper, maven }: +{ lib, javaPackages, fetchFromGitHub, jre, makeWrapper, maven }: -let +javaPackages.mavenfod rec { pname = "jd-cli"; version = "1.2.1"; @@ -11,39 +11,10 @@ let hash = "sha256-rRttA5H0A0c44loBzbKH7Waoted3IsOgxGCD2VM0U/Q="; }; - deps = stdenv.mkDerivation { - name = "${pname}-${version}-deps"; - inherit src; - - nativeBuildInputs = [ maven ]; - buildPhase = '' - mvn package -Dmaven.repo.local=$out - ''; - - # keep only *.{pom,jar,sha1,nbm} and delete all ephemeral files with lastModified timestamps inside - installPhase = '' - find $out -type f \ - -name \*.lastUpdated -or \ - -name resolver-status.properties -or \ - -name _remote.repositories \ - -delete - ''; - - dontFixup = true; - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "sha256-5d3ZLuzoEkPjh01uL/BuhJ6kevLdsm1P4PMLkEWaVUM="; - }; - -in stdenv.mkDerivation rec { - inherit pname version src; + mvnHash = "sha256-EIam0rxmCBs/mpMck6ePFoQBQ6KYYNqJKVE32gdXPfE="; nativeBuildInputs = [ maven makeWrapper ]; - buildPhase = '' - mvn --offline -Dmaven.repo.local=${deps} package; - ''; - installPhase = '' mkdir -p $out/bin $out/share/jd-cli install -Dm644 jd-cli/target/jd-cli.jar $out/share/jd-cli