From 6b0f4f603c16a15f33566ce4bc3512e9b85159d3 Mon Sep 17 00:00:00 2001 From: Jakub Kozłowski Date: Mon, 13 Jun 2022 23:40:34 +0200 Subject: scala-cli: 0.1.7 -> 0.1.8 --- .../tools/build-managers/scala-cli/default.nix | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) (limited to 'pkgs/development/tools/build-managers/scala-cli/default.nix') diff --git a/pkgs/development/tools/build-managers/scala-cli/default.nix b/pkgs/development/tools/build-managers/scala-cli/default.nix index 1eb6b92cbd4..314acfe71ff 100644 --- a/pkgs/development/tools/build-managers/scala-cli/default.nix +++ b/pkgs/development/tools/build-managers/scala-cli/default.nix @@ -1,5 +1,16 @@ -{ stdenv, coreutils, lib, installShellFiles, zlib, autoPatchelfHook, fetchurl, callPackage }: +{ stdenv +, coreutils +, lib +, installShellFiles +, zlib +, autoPatchelfHook +, fetchurl +, makeWrapper +, callPackage +, jre +}: +assert lib.versionAtLeast jre.version "17.0.0"; let pname = "scala-cli"; sources = builtins.fromJSON (builtins.readFile ./sources.json); @@ -9,7 +20,7 @@ let in stdenv.mkDerivation { inherit pname version; - nativeBuildInputs = [ installShellFiles ] + nativeBuildInputs = [ installShellFiles makeWrapper ] ++ lib.optional stdenv.isLinux autoPatchelfHook; buildInputs = [ coreutils zlib stdenv.cc.cc ]; src = @@ -28,7 +39,9 @@ stdenv.mkDerivation { installPhase = '' runHook preInstall - install -Dm755 scala-cli $out/bin/scala-cli + install -Dm755 scala-cli $out/bin/.scala-cli-wrapped + makeWrapper $out/bin/.scala-cli-wrapped $out/bin/scala-cli \ + --set JAVA_HOME ${jre.home} runHook postInstall ''; -- cgit 1.4.1