diff options
| author | David Guibert <david.guibert@gmail.com> | 2011-01-24 19:57:15 +0000 |
|---|---|---|
| committer | David Guibert <david.guibert@gmail.com> | 2011-01-24 19:57:15 +0000 |
| commit | 4f50c9147f14eeee93bd93da47f937c5a9173128 (patch) | |
| tree | c328642ec96dd41bac55b17e99350bfe5944f95f /pkgs/development/libraries/java/swt | |
| parent | fca3859da85d73c59f374a64eac6a0e0da1f2761 (diff) | |
| download | nixpkgs-4f50c9147f14eeee93bd93da47f937c5a9173128.tar nixpkgs-4f50c9147f14eeee93bd93da47f937c5a9173128.tar.gz nixpkgs-4f50c9147f14eeee93bd93da47f937c5a9173128.tar.bz2 nixpkgs-4f50c9147f14eeee93bd93da47f937c5a9173128.tar.lz nixpkgs-4f50c9147f14eeee93bd93da47f937c5a9173128.tar.xz nixpkgs-4f50c9147f14eeee93bd93da47f937c5a9173128.tar.zst nixpkgs-4f50c9147f14eeee93bd93da47f937c5a9173128.zip | |
update swt from 3.1.1 to 3.6.1
svn path=/nixpkgs/trunk/; revision=25682
Diffstat (limited to 'pkgs/development/libraries/java/swt')
| -rw-r--r-- | pkgs/development/libraries/java/swt/builder.sh | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/java/swt/default.nix | 19 |
2 files changed, 14 insertions, 7 deletions
diff --git a/pkgs/development/libraries/java/swt/builder.sh b/pkgs/development/libraries/java/swt/builder.sh index 624b2c86513..0a2f304801e 100644 --- a/pkgs/development/libraries/java/swt/builder.sh +++ b/pkgs/development/libraries/java/swt/builder.sh @@ -3,6 +3,8 @@ source $stdenv/setup 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 diff --git a/pkgs/development/libraries/java/swt/default.nix b/pkgs/development/libraries/java/swt/default.nix index f06f9ff5be9..311d05d1aad 100644 --- a/pkgs/development/libraries/java/swt/default.nix +++ b/pkgs/development/libraries/java/swt/default.nix @@ -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; } |