public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sbt-extras: Add JDK dependency 

The derivation would use `java` from the PATH. This fixed the behaviour.
This commit is contained in:
Tim Steinbach 2017-12-10 13:47:28 -05:00
parent b0114725f3
commit 4ff0429662
No known key found for this signature in database
GPG Key ID: 472BFCCA96BD0EDA
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/tools/build-managers/sbt-extras/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, which, curl, makeWrapper }:
{ stdenv, fetchFromGitHub, which, curl, makeWrapper, jdk }:
let
rev = "77686b3dfa20a34270cc52377c8e37c3a461e484";
@ -21,9 +21,12 @@ stdenv.mkDerivation {
installPhase = ''
mkdir -p $out/bin
substituteInPlace bin/sbt --replace 'declare java_cmd="java"' 'declare java_cmd="${jdk}/bin/java"'
install bin/sbt $out/bin
wrapProgram $out/bin/sbt --prefix PATH : ${stdenv.lib.makeBinPath [ which curl]}
wrapProgram $out/bin/sbt --prefix PATH : ${stdenv.lib.makeBinPath [ which curl ]}
'';
meta = {