- Upgraded GWT to 1.7.1
- The JDK is now a runtime dependency of GWT - Updated GWT-widgets library to 0.2.0 svn path=/nixpkgs/trunk/; revision=17882
This commit is contained in:
parent
2aaf37cdf9
commit
d1eb60faef
|
@ -16,7 +16,7 @@ cat > $out/bin/gwt-compile <<EOF
|
|||
export LD_LIBRARY_PATH=$libPath
|
||||
export LIBXCB_ALLOW_SLOPPY_LOCK=1 # Workaround for bug in Java AWT implementation
|
||||
|
||||
java -Xmx128m -cp "\$CLASSPATH:$out/$name/gwt-user.jar:$out/$name/gwt-dev-linux.jar" com.google.gwt.dev.GWTCompiler \$@
|
||||
$jdk/bin/java -Xmx128m -cp "\$CLASSPATH:$out/$name/gwt-user.jar:$out/$name/gwt-dev-linux.jar" com.google.gwt.dev.Compiler \$@
|
||||
EOF
|
||||
chmod 755 $out/bin/gwt-compile
|
||||
|
||||
|
@ -26,6 +26,6 @@ cat > $out/bin/gwt-shell <<EOF
|
|||
export LD_LIBRARY_PATH=$libPath
|
||||
export LIBXCB_ALLOW_SLOPPY_LOCK=1 # Workaround for bug in Java AWT implementation
|
||||
|
||||
java -Xmx128m -cp "\$CLASSPATH:$out/$name/gwt-user.jar:$out/$name/gwt-dev-linux.jar" com.google.gwt.dev.GWTShell \$@
|
||||
$jdk/bin/java -Xmx128m -cp "\$CLASSPATH:$out/$name/gwt-user.jar:$out/$name/gwt-dev-linux.jar" com.google.gwt.dev.GWTShell \$@
|
||||
EOF
|
||||
chmod 755 $out/bin/gwt-shell
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
{stdenv, fetchurl, glib, gtk, pango, atk, libX11, libXt, libstdcpp5}:
|
||||
{stdenv, fetchurl, glib, gtk, pango, atk, libX11, libXt, libstdcpp5, jdk}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "gwt-linux-1.5.3";
|
||||
name = "gwt-linux-1.7.1";
|
||||
builder = ./builder.sh;
|
||||
|
||||
src = fetchurl {
|
||||
url = http://google-web-toolkit.googlecode.com/files/gwt-linux-1.5.3.tar.bz2;
|
||||
sha1 = "5d7d3295cef4d0eb06a991138e9f538409146027";
|
||||
url = http://google-web-toolkit.googlecode.com/files/gwt-linux-1.7.1.tar.bz2;
|
||||
sha256 = "0lgirr9lr0qsfvw61hqzracdllqklb4qkzbk5x3lc4r64mms5b3g";
|
||||
};
|
||||
|
||||
inherit glib gtk pango atk libX11 libXt libstdcpp5;
|
||||
inherit glib gtk pango atk libX11 libXt libstdcpp5 jdk;
|
||||
buildInputs = [glib gtk pango atk libX11 libXt libstdcpp5];
|
||||
}
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
{stdenv, fetchurl}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "gwt-widgets-0.1.5";
|
||||
name = "gwt-widgets-0.2.0";
|
||||
builder = ./builder.sh;
|
||||
|
||||
src = fetchurl {
|
||||
url = http://heanet.dl.sourceforge.net/sourceforge/gwt-widget/gwt-widgets-0.1.5-bin.tar.gz;
|
||||
md5 = "daf59b3bc28a9045b6165f185e3e77a0";
|
||||
url = mirror://sourceforge/gwt-widget/gwt-widgets-0.2.0-bin.tar.gz;
|
||||
sha256 = "09isj4j6842rj13nv8264irkjjhvmgihmi170ciabc98911bakxb";
|
||||
};
|
||||
}
|
||||
|
|
|
@ -2044,7 +2044,7 @@ let
|
|||
};
|
||||
|
||||
gwt = import ../development/compilers/gwt {
|
||||
inherit stdenv fetchurl;
|
||||
inherit stdenv fetchurl jdk;
|
||||
inherit (gtkLibs) glib gtk pango atk;
|
||||
inherit (xlibs) libX11 libXt;
|
||||
libstdcpp5 = gcc33.gcc;
|
||||
|
|
Loading…
Reference in a new issue