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

sbt: drop unconditionally set $SBT_OPTS variable from script

Browse Source 
... and rename simple-build-tool to just "sbt", which is the name
everybody uses these days.
This commit is contained in:
Peter Simons 2014-09-12 17:09:58 +02:00
parent ec59929c9f
commit 5b28aebc08
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/tools/build-managers/simple-build-tool/default.nix → pkgs/development/tools/build-managers/sbt/default.nix
View File

@ -14,8 +14,7 @@ stdenv.mkDerivation rec {
installPhase = '' installPhase = ''
mkdir -p $out/bin mkdir -p $out/bin
cat > $out/bin/sbt << EOF cat > $out/bin/sbt << EOF
#!/bin/sh #! ${stdenv.shell}
SBT_OPTS="-Xms512M -Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=384M"
${jre}/bin/java \$SBT_OPTS -jar ${src} "\$@" ${jre}/bin/java \$SBT_OPTS -jar ${src} "\$@"
EOF EOF
chmod +x $out/bin/sbt chmod +x $out/bin/sbt

5
pkgs/top-level/all-packages.nix
View File

@ -4314,7 +4314,8 @@ let
scons = callPackage ../development/tools/build-managers/scons { }; scons = callPackage ../development/tools/build-managers/scons { };
simpleBuildTool = callPackage ../development/tools/build-managers/simple-build-tool { }; sbt = callPackage ../development/tools/build-managers/sbt { };
simpleBuildTool = sbt;
sigrok-cli = callPackage ../development/tools/sigrok-cli { }; sigrok-cli = callPackage ../development/tools/sigrok-cli { };
@ -7219,7 +7220,7 @@ let
tomcat8 = callPackage ../servers/http/tomcat/8.0.nix { }; tomcat8 = callPackage ../servers/http/tomcat/8.0.nix { };
tomcat_mysql_jdbc = callPackage ../servers/http/tomcat/jdbc/mysql { }; tomcat_mysql_jdbc = callPackage ../servers/http/tomcat/jdbc/mysql { };
torque = callPackage ../servers/computing/torque { }; torque = callPackage ../servers/computing/torque { };
axis2 = callPackage ../servers/http/tomcat/axis2 { }; axis2 = callPackage ../servers/http/tomcat/axis2 { };