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

- Upgraded GWT to 1.7.1

Browse Source 
- 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:
Sander van der Burg 2009-10-19 13:14:23 +00:00
parent 2aaf37cdf9
commit d1eb60faef
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/compilers/gwt/builder.sh
View File

@ -16,7 +16,7 @@ cat > $out/bin/gwt-compile <<EOF
export LD_LIBRARY_PATH=$libPath export LD_LIBRARY_PATH=$libPath
export LIBXCB_ALLOW_SLOPPY_LOCK=1 # Workaround for bug in Java AWT implementation 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 EOF
chmod 755 $out/bin/gwt-compile chmod 755 $out/bin/gwt-compile
@ -26,6 +26,6 @@ cat > $out/bin/gwt-shell <<EOF
export LD_LIBRARY_PATH=$libPath export LD_LIBRARY_PATH=$libPath
export LIBXCB_ALLOW_SLOPPY_LOCK=1 # Workaround for bug in Java AWT implementation 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 EOF
chmod 755 $out/bin/gwt-shell chmod 755 $out/bin/gwt-shell

10
pkgs/development/compilers/gwt/default.nix
View File

@ -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 { stdenv.mkDerivation {
name = "gwt-linux-1.5.3"; name = "gwt-linux-1.7.1";
builder = ./builder.sh; builder = ./builder.sh;
src = fetchurl { src = fetchurl {
url = http://google-web-toolkit.googlecode.com/files/gwt-linux-1.5.3.tar.bz2; url = http://google-web-toolkit.googlecode.com/files/gwt-linux-1.7.1.tar.bz2;
sha1 = "5d7d3295cef4d0eb06a991138e9f538409146027"; 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]; buildInputs = [glib gtk pango atk libX11 libXt libstdcpp5];
} }

6
pkgs/development/libraries/java/gwt-widgets/default.nix
View File

@ -1,11 +1,11 @@
{stdenv, fetchurl}: {stdenv, fetchurl}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "gwt-widgets-0.1.5"; name = "gwt-widgets-0.2.0";
builder = ./builder.sh; builder = ./builder.sh;
src = fetchurl { src = fetchurl {
url = http://heanet.dl.sourceforge.net/sourceforge/gwt-widget/gwt-widgets-0.1.5-bin.tar.gz; url = mirror://sourceforge/gwt-widget/gwt-widgets-0.2.0-bin.tar.gz;
md5 = "daf59b3bc28a9045b6165f185e3e77a0"; sha256 = "09isj4j6842rj13nv8264irkjjhvmgihmi170ciabc98911bakxb";
}; };
} }

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

@ -2044,7 +2044,7 @@ let
}; };
gwt = import ../development/compilers/gwt { gwt = import ../development/compilers/gwt {
inherit stdenv fetchurl; inherit stdenv fetchurl jdk;
inherit (gtkLibs) glib gtk pango atk; inherit (gtkLibs) glib gtk pango atk;
inherit (xlibs) libX11 libXt; inherit (xlibs) libX11 libXt;
libstdcpp5 = gcc33.gcc; libstdcpp5 = gcc33.gcc;