From 98be4ed5e8ed5a06efa0592ef23cf0afabd8c36b Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Fri, 25 Sep 2015 16:54:35 +0200 Subject: [PATCH] sbt: use sbt-launcher-package. --- .../tools/build-managers/sbt/default.nix | 20 ++++++++----------- 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix index b4cfc0bf0c1a..585e9ff101a4 100644 --- a/pkgs/development/tools/build-managers/sbt/default.nix +++ b/pkgs/development/tools/build-managers/sbt/default.nix @@ -5,22 +5,18 @@ stdenv.mkDerivation rec { version = "0.13.9"; src = fetchurl { - url = "http://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/sbt-launch/${version}/sbt-launch.jar"; - sha256 = "04k411gcrq35ayd2xj79bcshczslyqkicwvhkf07hkyr4j3blxda"; + url = "https://dl.bintray.com/sbt/native-packages/sbt/${version}/${name}.tgz"; + sha256 = "148f2801f2993773de6f8859fe0e6520fcabe649d66bb316e13aff8b2fd7f504"; }; - phases = [ "installPhase" ]; + patchPhase = '' + echo -java-home ${jre.home} >>conf/sbtopts + ''; installPhase = '' - mkdir -p $out/bin - cat > $out/bin/sbt << EOF - #! ${stdenv.shell} - if [ ! -v JAVA_HOME ]; then - export JAVA_HOME="${jre.home}" - fi - ${jre}/bin/java \$SBT_OPTS -jar ${src} "\$@" - EOF - chmod +x $out/bin/sbt + mkdir -p $out/share/sbt $out/bin + cp -ra . $out/share/sbt + ln -s $out/share/sbt/bin/sbt $out/bin/ ''; meta = {