tjh.dev / nixpkgs
Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
fork atom

- 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

Sander van der Burg d1eb60fa 2aaf37cd

+11 -11
unified split
+2 -2
pkgs/development/compilers/gwt/builder.sh
··· 16 16 export LD_LIBRARY_PATH=$libPath 17 17 export LIBXCB_ALLOW_SLOPPY_LOCK=1 # Workaround for bug in Java AWT implementation 18 18 19 - java -Xmx128m -cp "\$CLASSPATH:$out/$name/gwt-user.jar:$out/$name/gwt-dev-linux.jar" com.google.gwt.dev.GWTCompiler \$@ 19 + $jdk/bin/java -Xmx128m -cp "\$CLASSPATH:$out/$name/gwt-user.jar:$out/$name/gwt-dev-linux.jar" com.google.gwt.dev.Compiler \$@ 20 20 EOF 21 21 chmod 755 $out/bin/gwt-compile 22 22 ··· 26 26 export LD_LIBRARY_PATH=$libPath 27 27 export LIBXCB_ALLOW_SLOPPY_LOCK=1 # Workaround for bug in Java AWT implementation 28 28 29 - java -Xmx128m -cp "\$CLASSPATH:$out/$name/gwt-user.jar:$out/$name/gwt-dev-linux.jar" com.google.gwt.dev.GWTShell \$@ 29 + $jdk/bin/java -Xmx128m -cp "\$CLASSPATH:$out/$name/gwt-user.jar:$out/$name/gwt-dev-linux.jar" com.google.gwt.dev.GWTShell \$@ 30 30 EOF 31 31 chmod 755 $out/bin/gwt-shell
+5 -5
pkgs/development/compilers/gwt/default.nix
··· 1 - {stdenv, fetchurl, glib, gtk, pango, atk, libX11, libXt, libstdcpp5}: 1 + {stdenv, fetchurl, glib, gtk, pango, atk, libX11, libXt, libstdcpp5, jdk}: 2 2 3 3 stdenv.mkDerivation { 4 - name = "gwt-linux-1.5.3"; 4 + name = "gwt-linux-1.7.1"; 5 5 builder = ./builder.sh; 6 6 7 7 src = fetchurl { 8 - url = http://google-web-toolkit.googlecode.com/files/gwt-linux-1.5.3.tar.bz2; 9 - sha1 = "5d7d3295cef4d0eb06a991138e9f538409146027"; 8 + url = http://google-web-toolkit.googlecode.com/files/gwt-linux-1.7.1.tar.bz2; 9 + sha256 = "0lgirr9lr0qsfvw61hqzracdllqklb4qkzbk5x3lc4r64mms5b3g"; 10 10 }; 11 11 12 - inherit glib gtk pango atk libX11 libXt libstdcpp5; 12 + inherit glib gtk pango atk libX11 libXt libstdcpp5 jdk; 13 13 buildInputs = [glib gtk pango atk libX11 libXt libstdcpp5]; 14 14 }
+3 -3
pkgs/development/libraries/java/gwt-widgets/default.nix
··· 1 1 {stdenv, fetchurl}: 2 2 3 3 stdenv.mkDerivation { 4 - name = "gwt-widgets-0.1.5"; 4 + name = "gwt-widgets-0.2.0"; 5 5 builder = ./builder.sh; 6 6 7 7 src = fetchurl { 8 - url = http://heanet.dl.sourceforge.net/sourceforge/gwt-widget/gwt-widgets-0.1.5-bin.tar.gz; 9 - md5 = "daf59b3bc28a9045b6165f185e3e77a0"; 8 + url = mirror://sourceforge/gwt-widget/gwt-widgets-0.2.0-bin.tar.gz; 9 + sha256 = "09isj4j6842rj13nv8264irkjjhvmgihmi170ciabc98911bakxb"; 10 10 }; 11 11 }
+1 -1
pkgs/top-level/all-packages.nix
··· 2044 2044 }; 2045 2045 2046 2046 gwt = import ../development/compilers/gwt { 2047 - inherit stdenv fetchurl; 2047 + inherit stdenv fetchurl jdk; 2048 2048 inherit (gtkLibs) glib gtk pango atk; 2049 2049 inherit (xlibs) libX11 libXt; 2050 2050 libstdcpp5 = gcc33.gcc;