diff options
Diffstat (limited to 'pkgs/development/libraries/java/swt/default.nix')
| -rw-r--r-- | pkgs/development/libraries/java/swt/default.nix | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/pkgs/development/libraries/java/swt/default.nix b/pkgs/development/libraries/java/swt/default.nix index 37b8b502c3b7..2cf08e345758 100644 --- a/pkgs/development/libraries/java/swt/default.nix +++ b/pkgs/development/libraries/java/swt/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, unzip, jdk, pkgconfig, gtk -, libXtst, libXi, mesa, webkit, libsoup, xorg +{ stdenv, lib, fetchurl, unzip, jdk, pkgconfig, gtk2 +, libXt, libXtst, libXi, mesa, webkit, libsoup, xorg , pango, gdk_pixbuf, glib }: @@ -7,38 +7,39 @@ let platformMap = { "x86_64-linux" = { platform = "gtk-linux-x86_64"; - sha256 = "0hq48zfqx2p0fqr0rlabnz2pdj0874k19918a4dbj0fhzkhrh959"; }; + sha256 = "1qq0pjll6030v4ml0hifcaaik7sx3fl7ghybfdw95vsvxafwp2ff"; }; "i686-linux" = { platform = "gtk-linux-x86"; - sha256 = "10si8kmc7c9qmbpzs76609wkfb784pln3qpmra73gb3fbk7z8caf"; }; + sha256 = "03mhzraikcs4fsz7d3h5af9pw1bbcfd6dglsvbk2ciwimy9zj30q"; }; "x86_64-darwin" = { platform = "cocoa-macosx-x86_64"; - sha256 = "1565gg63ssrl04fh355vf9mnmq8qwwki3zpc3ybm7bylgkfwc9h4"; }; + sha256 = "00k1mfbncvyh8klgmk0891w8jwnd5niqb16j1j8yacrm2smmlb05"; }; }; metadata = assert platformMap ? ${stdenv.system}; platformMap.${stdenv.system}; in stdenv.mkDerivation rec { - version = "3.7.2"; - fullVersion = "${version}-201202080800"; + version = "4.5"; + fullVersion = "${version}-201506032000"; name = "swt-${version}"; + hardeningDisable = [ "format" ]; + # 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://archive.eclipse.org/eclipse/downloads/drops/R-${fullVersion}/${name}-${metadata.platform}.zip"; + url = "http://archive.eclipse.org/eclipse/downloads/drops4/R-${fullVersion}/${name}-${metadata.platform}.zip"; sha256 = metadata.sha256; }; sourceRoot = "."; - buildInputs = [ unzip jdk pkgconfig gtk libXtst libXi mesa webkit libsoup ]; + nativeBuildInputs = [ unzip pkgconfig ]; + buildInputs = [ jdk gtk2 libXt libXtst libXi mesa webkit libsoup ]; - NIX_LFLAGS = [ "-lX11" "-I${xorg.libX11}/lib" - "-lpango-1.0" "-I${pango}/lib" - "-lgdk_pixbuf-2.0" "-I${gdk_pixbuf}/lib" - "-lglib-2.0" "-I${glib}/lib"]; + NIX_LFLAGS = (map (x: "-L${lib.getLib x}/lib") [ xorg.libX11 pango gdk_pixbuf glib ]) ++ + [ "-lX11" "-lpango-1.0" "-lgdk_pixbuf-2.0" "-lglib-2.0" ]; buildPhase = '' unzip src.zip -d src |