diff options
author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-06-20 10:15:39 +0300 |
---|---|---|
committer | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-06-20 10:15:39 +0300 |
commit | c44a486d0ad97be7ecd01484e0e76a803ec05bb4 (patch) | |
tree | 23e179c8a515ba54d9188425f757b7536ba43c92 /pkgs/development/tools/java | |
parent | fcb1400f3e18a2307dc29cc2f6b01be68d58a530 (diff) |
java-language-server: convert to mavenfod
Diffstat (limited to 'pkgs/development/tools/java')
-rw-r--r-- | pkgs/development/tools/java/java-language-server/default.nix | 49 |
1 files changed, 7 insertions, 42 deletions
diff --git a/pkgs/development/tools/java/java-language-server/default.nix b/pkgs/development/tools/java/java-language-server/default.nix index 47054564f9b7a..8451fe15e7569 100644 --- a/pkgs/development/tools/java/java-language-server/default.nix +++ b/pkgs/development/tools/java/java-language-server/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub +{ lib, javaPackages, stdenv, fetchFromGitHub , jdk, maven -, runtimeShell, makeWrapper +, makeWrapper }: let @@ -10,7 +10,7 @@ let else if stdenv.isWindows then "windows" else throw "unsupported platform"; in -stdenv.mkDerivation rec { +javaPackages.mavenfod rec { pname = "java-language-server"; version = "0.2.38"; @@ -22,45 +22,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-zkbl/SLg09XK2ZhJNzWEtvFCQBRQ62273M/2+4HV1Lk="; }; - fetchedMavenDeps = stdenv.mkDerivation { - name = "java-language-server-${version}-maven-deps"; - inherit src; - buildInputs = [ maven ]; - - buildPhase = '' - runHook preBuild - - mvn package -Dmaven.repo.local=$out -DskipTests - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - find $out -type f \ - -name \*.lastUpdated -or \ - -name resolver-status.properties -or \ - -name _remote.repositories \ - -delete - - runHook postInstall - ''; - - dontFixup = true; - dontConfigure = true; - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "sha256-YkcQKmm8oeEH7uyUzV/qGoe4LiI6o5wZ7o69qrO3oCA="; - }; - + mvnFetchExtraArgs.dontConfigure = true; + mvnParameters = "-DskipTests"; + mvnHash = "sha256-2MVlF3QIWiDvUlnMH4RLi2Od57aoh8zK/OmHqztOnZ4="; nativeBuildInputs = [ maven jdk makeWrapper ]; dontConfigure = true; - buildPhase = '' - runHook preBuild - + preBuild = '' jlink \ ${lib.optionalString (!stdenv.isDarwin) "--module-path './jdks/${platform}/jdk-13/jmods'"} \ --add-modules java.base,java.compiler,java.logging,java.sql,java.xml,jdk.compiler,jdk.jdi,jdk.unsupported,jdk.zipfs \ @@ -68,10 +37,6 @@ stdenv.mkDerivation rec { --no-header-files \ --no-man-pages \ --compress 2 - - mvn package --offline -Dmaven.repo.local=${fetchedMavenDeps} -DskipTests - - runHook postBuild ''; installPhase = '' |