diff options
author | Peter Simons <simons@cryp.to> | 2012-01-18 20:32:20 +0000 |
---|---|---|
committer | Peter Simons <simons@cryp.to> | 2012-01-18 20:32:20 +0000 |
commit | 3eca1b395f15224d898bd4234490d9200514a531 (patch) | |
tree | 2c30c0d2dcad6cad2b11d91729f5d53f3c4d4cab /pkgs/development/interpreters/jruby | |
parent | 3dd02a75ef976a93ea47507e6d58f8d73f3d2d65 (diff) |
jruby: upgraded to latest version, fixed java dependency
svn path=/nixpkgs/trunk/; revision=31648
Diffstat (limited to 'pkgs/development/interpreters/jruby')
-rw-r--r-- | pkgs/development/interpreters/jruby/default.nix | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/pkgs/development/interpreters/jruby/default.nix b/pkgs/development/interpreters/jruby/default.nix index d26ab69493441..da2e0b65f0088 100644 --- a/pkgs/development/interpreters/jruby/default.nix +++ b/pkgs/development/interpreters/jruby/default.nix @@ -1,18 +1,30 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation { - name = "jruby-1.1.6"; + name = "jruby-1.6.5.1"; src = fetchurl { - url = http://dist.codehaus.org/jruby/1.1.6RC1/jruby-bin-1.1.6RC1.tar.gz; - sha256 = "1q3cjshxk484i8gqxm682bxcrps7205nl9vlim4s6z827bjlmc4a"; + url = http://jruby.org.s3.amazonaws.com/downloads/1.6.5.1/jruby-bin-1.6.5.1.tar.gz; + sha256 = "1j0iv1q950lyir9vqfgg2533f1q28jaz7vnxqswsaix1mjhm29qd"; }; - installPhase = '' ensureDir $out; cp -r * $out ''; + buildInputs = [ makeWrapper ]; + + installPhase = '' + ensureDir $out + mv * $out + rm $out/bin/*.{bat,dll,exe,sh} + mv $out/README $out/docs + + for i in $out/bin/*; do + wrapProgram $i \ + --set JAVA_HOME ${jre} + done + ''; meta = { description = "Ruby interpreter written in Java"; - homepage = http://jruby.codehaus.org/; + homepage = http://jruby.org/; license = "CPL-1.0 GPL-2 LGPL-2.1"; # one of those }; } |