Merge branch 'master.upstream' into staging.upstream

2015-08-09 13:34:18 -07:00
parent d3ac5c534d 6cfff02b9b
commit 6e698f9c61
61 changed files with 848 additions and 431 deletions
@@ -15,6 +15,9 @@ stdenv.mkDerivation rec {
    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