Author: guibert
Date: Mon Jan 24 19:57:15 2011
New Revision: 25682
URL: https://svn.nixos.org/websvn/nix/?rev=25682&sc=1
Log:
update swt from 3.1.1 to 3.6.1
Modified:
nixpkgs/trunk/pkgs/development/libraries/java/swt/builder.sh
nixpkgs/trunk/pkgs/development/libraries/java/swt/default.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/java/swt/builder.sh
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/java/swt/builder.sh Mon Jan
24 15:41:08 2011 (r25681)
+++ nixpkgs/trunk/pkgs/development/libraries/java/swt/builder.sh Mon Jan
24 19:57:15 2011 (r25682)
@@ -3,6 +3,8 @@
unzip $src src.zip
unzip src.zip
+export JAVA_HOME=${jdk}
+echo $JAVA_HOME=${jdk}
sh ./build.sh make_swt make_atk
ensureDir $out/lib
Modified: nixpkgs/trunk/pkgs/development/libraries/java/swt/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/java/swt/default.nix Mon Jan
24 15:41:08 2011 (r25681)
+++ nixpkgs/trunk/pkgs/development/libraries/java/swt/default.nix Mon Jan
24 19:57:15 2011 (r25682)
@@ -1,16 +1,21 @@
-{stdenv, fetchurl, unzip, jdk, pkgconfig, gtk, libXtst}:
+{ stdenv, fetchurl, unzip, jdk, pkgconfig, gtk
+, libXtst
+, libXi
+, mesa
+}:
stdenv.mkDerivation {
- name = "swt-3.1.1";
+ name = "swt-3.6.1";
builder = ./builder.sh;
-
+
# Alas, the Eclipse Project apparently doesn't produce source-only
# releases of SWT. So we just grab a binary release and extract
# "src.zip" from that.
src = fetchurl {
- url =
http://sunsite.informatik.rwth-aachen.de/eclipse/downloads/drops/R-3.1.1-200509290840/swt-3.1.1-gtk-linux-x86.zip;
- md5 = "23dfe5a4a566439c5f526d9ea3b3db1c";
+ url =
http://eclipse.ialto.com/eclipse/downloads/drops/R-3.6.1-201009090800/swt-3.6.1-gtk-linux-x86.zip;
+ sha1 = "e629e0b65296b67931f1fce8ab72419818c9747f";
};
-
- buildInputs = [unzip jdk pkgconfig gtk libXtst];
+
+ buildInputs = [unzip jdk pkgconfig gtk libXtst libXi mesa];
+ inherit jdk;
}
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
