summary refs log tree commit diff
path: root/pkgs/development/tools
diff options
context:
space:
mode:
authorTim Steinbach <tim@nequissimus.com>2017-12-10 13:47:28 -0500
committerTim Steinbach <tim@nequissimus.com>2017-12-10 13:48:23 -0500
commit4ff0429662e60662e07deb1ca6998ae6803546d1 (patch)
tree509f44ffc5143b86e91689cc9b63552533be40d6 /pkgs/development/tools
parentb0114725f3b49eff7021ebf02d76779d4397a8fe (diff)
downloadnixlib-4ff0429662e60662e07deb1ca6998ae6803546d1.tar
nixlib-4ff0429662e60662e07deb1ca6998ae6803546d1.tar.gz
nixlib-4ff0429662e60662e07deb1ca6998ae6803546d1.tar.bz2
nixlib-4ff0429662e60662e07deb1ca6998ae6803546d1.tar.lz
nixlib-4ff0429662e60662e07deb1ca6998ae6803546d1.tar.xz
nixlib-4ff0429662e60662e07deb1ca6998ae6803546d1.tar.zst
nixlib-4ff0429662e60662e07deb1ca6998ae6803546d1.zip
sbt-extras: Add JDK dependency
The derivation would use `java` from the PATH. This fixed the behaviour.
Diffstat (limited to 'pkgs/development/tools')
-rw-r--r--pkgs/development/tools/build-managers/sbt-extras/default.nix7
1 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/development/tools/build-managers/sbt-extras/default.nix b/pkgs/development/tools/build-managers/sbt-extras/default.nix
index fbbca9a0cfe4..bea20863e7f1 100644
--- a/pkgs/development/tools/build-managers/sbt-extras/default.nix
+++ b/pkgs/development/tools/build-managers/sbt-extras/default.nix
@@ -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 = {