From e8d85753cf94ffbf00b6091f51c745f8f07b06fd Mon Sep 17 00:00:00 2001
From: "Luis G. Torres" <lgtorres42@gmail.com>
Date: Sun, 15 Mar 2015 00:04:24 -0400
Subject: [PATCH 1/2] Added Darwin case for java.swt. This still can't be built
 on Darwin, but at least this derivation won't cause nix-env -qas to crash on
 Darwin.

---
 .../libraries/java/swt/default.nix            | 24 ++++++++++++++-----
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/java/swt/default.nix b/pkgs/development/libraries/java/swt/default.nix
index 795062f12d5..e2870de05bc 100644
--- a/pkgs/development/libraries/java/swt/default.nix
+++ b/pkgs/development/libraries/java/swt/default.nix
@@ -6,11 +6,23 @@
 , libsoup
 }:
 
-let metadata = if stdenv.system == "i686-linux"
-               then { arch = "x86"; sha256 = "10si8kmc7c9qmbpzs76609wkfb784pln3qpmra73gb3fbk7z8caf"; }
-               else if stdenv.system == "x86_64-linux"
-                    then { arch = "x86_64"; sha256 = "0hq48zfqx2p0fqr0rlabnz2pdj0874k19918a4dbj0fhzkhrh959"; }
-                    else { };
+let
+  metadata =
+    if stdenv.isLinux then
+      if stdenv.isx86_64 then
+        { platform = "gtk-linux-x86_64";
+          sha256 = "0hq48zfqx2p0fqr0rlabnz2pdj0874k19918a4dbj0fhzkhrh959"; }
+      else if stdenv.isi686 then
+             { platform = "gtk-linux-x86";
+               sha256 = "10si8kmc7c9qmbpzs76609wkfb784pln3qpmra73gb3fbk7z8caf"; }
+           else { }
+    else if stdenv.isDarwin then
+           if stdenv.isx86_64 then
+             { platform = "cocoa-macosx-x86_64";
+               sha256 = "1565gg63ssrl04fh355vf9mnmq8qwwki3zpc3ybm7bylgkfwc9h4"; }
+           else { }
+         else { };
+
 in stdenv.mkDerivation rec {
   version = "3.7.2";
   fullVersion = "${version}-201202080800";
@@ -22,7 +34,7 @@ in stdenv.mkDerivation rec {
   # 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}-gtk-linux-${metadata.arch}.zip";
+    url = "http://archive.eclipse.org/eclipse/downloads/drops/R-${fullVersion}/${name}-${metadata.platform}.zip";
     sha256 = metadata.sha256;
   };
 

From d1cf37eeb76dd1eb2ec731cc09aef3f8ce84f7db Mon Sep 17 00:00:00 2001
From: "Luis G. Torres" <lgtorres42@gmail.com>
Date: Tue, 17 Mar 2015 19:22:38 -0400
Subject: [PATCH 2/2] Cleaned up swt derivation

---
 .../libraries/java/swt/default.nix            | 28 +++++++++----------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/libraries/java/swt/default.nix b/pkgs/development/libraries/java/swt/default.nix
index e2870de05bc..d942dd7b692 100644
--- a/pkgs/development/libraries/java/swt/default.nix
+++ b/pkgs/development/libraries/java/swt/default.nix
@@ -7,21 +7,19 @@
 }:
 
 let
-  metadata =
-    if stdenv.isLinux then
-      if stdenv.isx86_64 then
-        { platform = "gtk-linux-x86_64";
-          sha256 = "0hq48zfqx2p0fqr0rlabnz2pdj0874k19918a4dbj0fhzkhrh959"; }
-      else if stdenv.isi686 then
-             { platform = "gtk-linux-x86";
-               sha256 = "10si8kmc7c9qmbpzs76609wkfb784pln3qpmra73gb3fbk7z8caf"; }
-           else { }
-    else if stdenv.isDarwin then
-           if stdenv.isx86_64 then
-             { platform = "cocoa-macosx-x86_64";
-               sha256 = "1565gg63ssrl04fh355vf9mnmq8qwwki3zpc3ybm7bylgkfwc9h4"; }
-           else { }
-         else { };
+  platformMap = {
+    "x86_64-linux" =
+      { platform = "gtk-linux-x86_64";
+        sha256 = "0hq48zfqx2p0fqr0rlabnz2pdj0874k19918a4dbj0fhzkhrh959"; };
+    "i686-linux" =
+      { platform = "gtk-linux-x86";
+        sha256 = "10si8kmc7c9qmbpzs76609wkfb784pln3qpmra73gb3fbk7z8caf"; };
+    "x86_64-darwin" =
+      { platform = "cocoa-macosx-x86_64";
+        sha256 = "1565gg63ssrl04fh355vf9mnmq8qwwki3zpc3ybm7bylgkfwc9h4"; };
+  };
+
+  metadata = assert platformMap ? ${stdenv.system}; platformMap.${stdenv.system};
 
 in stdenv.mkDerivation rec {
   version = "3.7.2";