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

jruby: upgraded to latest version, fixed java dependency 

svn path=/nixpkgs/trunk/; revision=31648
This commit is contained in:
Peter Simons 2012-01-18 20:32:20 +00:00
parent 3dd02a75ef
commit 3eca1b395f
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pkgs/development/interpreters/jruby/default.nix
View File

@ -1,18 +1,30 @@
{ stdenv, fetchurl }: { stdenv, fetchurl, makeWrapper, jre }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "jruby-1.1.6"; name = "jruby-1.6.5.1";
src = fetchurl { src = fetchurl {
url = http://dist.codehaus.org/jruby/1.1.6RC1/jruby-bin-1.1.6RC1.tar.gz; url = http://jruby.org.s3.amazonaws.com/downloads/1.6.5.1/jruby-bin-1.6.5.1.tar.gz;
sha256 = "1q3cjshxk484i8gqxm682bxcrps7205nl9vlim4s6z827bjlmc4a"; 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 = { meta = {
description = "Ruby interpreter written in Java"; 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 license = "CPL-1.0 GPL-2 LGPL-2.1"; # one of those
}; };
} }

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

@ -2777,7 +2777,7 @@ let
jdtsdk = callPackage ../development/eclipse/jdt-sdk { }; jdtsdk = callPackage ../development/eclipse/jdt-sdk { };
jruby116 = callPackage ../development/interpreters/jruby { }; jruby165 = callPackage ../development/interpreters/jruby { };
guileCairo = callPackage ../development/guile-modules/guile-cairo { }; guileCairo = callPackage ../development/guile-modules/guile-cairo { };