diff options
| author | Sander van der Burg <s.vanderburg@tudelft.nl> | 2009-10-19 13:14:23 +0000 |
|---|---|---|
| committer | Sander van der Burg <s.vanderburg@tudelft.nl> | 2009-10-19 13:14:23 +0000 |
| commit | d1eb60faef74e43c545493b29dc1595bdf703272 (patch) | |
| tree | 8094cf5dd4eb4667750b4c5cda8549c2bdea85d8 /pkgs/development/compilers/gwt | |
| parent | 2aaf37cdf9a2bd45e03aad0b3bab93793218ad04 (diff) | |
| download | nixlib-d1eb60faef74e43c545493b29dc1595bdf703272.tar nixlib-d1eb60faef74e43c545493b29dc1595bdf703272.tar.gz nixlib-d1eb60faef74e43c545493b29dc1595bdf703272.tar.bz2 nixlib-d1eb60faef74e43c545493b29dc1595bdf703272.tar.lz nixlib-d1eb60faef74e43c545493b29dc1595bdf703272.tar.xz nixlib-d1eb60faef74e43c545493b29dc1595bdf703272.tar.zst nixlib-d1eb60faef74e43c545493b29dc1595bdf703272.zip | |
- 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
Diffstat (limited to 'pkgs/development/compilers/gwt')
| -rw-r--r-- | pkgs/development/compilers/gwt/builder.sh | 4 | ||||
| -rw-r--r-- | pkgs/development/compilers/gwt/default.nix | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/development/compilers/gwt/builder.sh b/pkgs/development/compilers/gwt/builder.sh index 9dc8e3963542..4bf19a44f8bb 100644 --- a/pkgs/development/compilers/gwt/builder.sh +++ b/pkgs/development/compilers/gwt/builder.sh @@ -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 diff --git a/pkgs/development/compilers/gwt/default.nix b/pkgs/development/compilers/gwt/default.nix index 96a3b6109fab..f22996a6a670 100644 --- a/pkgs/development/compilers/gwt/default.nix +++ b/pkgs/development/compilers/gwt/default.nix @@ -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]; } |