From 16afcaccbfd8f28032083f075d870148f110acf0 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 30 Apr 2022 17:28:05 -0500 Subject: [PATCH] scalafmt: use setJavaClassPath, drop jdk dep --- pkgs/development/tools/scalafmt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/scalafmt/default.nix b/pkgs/development/tools/scalafmt/default.nix index 50a81557b139..85a777390023 100644 --- a/pkgs/development/tools/scalafmt/default.nix +++ b/pkgs/development/tools/scalafmt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, jdk, jre, coursier, makeWrapper }: +{ lib, stdenv, jre, coursier, makeWrapper, setJavaClassPath }: let baseName = "scalafmt"; @@ -20,8 +20,8 @@ stdenv.mkDerivation { pname = baseName; inherit version; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ jdk deps ]; + nativeBuildInputs = [ makeWrapper setJavaClassPath ]; + buildInputs = [ deps ]; dontUnpack = true;