From 5b28aebc087429837adc7f0c65ff70df98ec8129 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Sep 2014 17:09:58 +0200 Subject: [PATCH] sbt: drop unconditionally set $SBT_OPTS variable from script ... and rename simple-build-tool to just "sbt", which is the name everybody uses these days. --- .../build-managers/{simple-build-tool => sbt}/default.nix | 3 +-- pkgs/top-level/all-packages.nix | 5 +++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename pkgs/development/tools/build-managers/{simple-build-tool => sbt}/default.nix (87%) diff --git a/pkgs/development/tools/build-managers/simple-build-tool/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix similarity index 87% rename from pkgs/development/tools/build-managers/simple-build-tool/default.nix rename to pkgs/development/tools/build-managers/sbt/default.nix index b54f894d8eb..39937f7d378 100644 --- a/pkgs/development/tools/build-managers/simple-build-tool/default.nix +++ b/pkgs/development/tools/build-managers/sbt/default.nix @@ -14,8 +14,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin cat > $out/bin/sbt << EOF - #!/bin/sh - SBT_OPTS="-Xms512M -Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=384M" + #! ${stdenv.shell} ${jre}/bin/java \$SBT_OPTS -jar ${src} "\$@" EOF chmod +x $out/bin/sbt diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eb8706f779e..13dc355afb2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4314,7 +4314,8 @@ let 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 { }; @@ -7219,7 +7220,7 @@ let tomcat8 = callPackage ../servers/http/tomcat/8.0.nix { }; tomcat_mysql_jdbc = callPackage ../servers/http/tomcat/jdbc/mysql { }; - + torque = callPackage ../servers/computing/torque { }; axis2 = callPackage ../servers/http/tomcat/axis2 { };