From c46c37efb58211573e817f6ad9c94f9145667df0 Mon Sep 17 00:00:00 2001
From: Patrick Mahoney <pat@polycrystal.org>
Date: Mon, 20 Oct 2014 12:52:19 -0500
Subject: [PATCH] j: Relax platform restriction.

Builds and runs on x86_64-darwin.
---
 pkgs/development/interpreters/j/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/interpreters/j/default.nix b/pkgs/development/interpreters/j/default.nix
index d4a1ab85b139..9c09038051ef 100644
--- a/pkgs/development/interpreters/j/default.nix
+++ b/pkgs/development/interpreters/j/default.nix
@@ -29,12 +29,12 @@ rec {
   /* doConfigure should be removed if not needed */
   phaseNames = ["doUnpack" "doBuildJ" "doDeploy"];
 
-  bits = if a.stdenv.system == "i686-linux" then 
-    "32"
-  else if a.stdenv.system == "x86_64-linux" then
+  bits = if a.stdenv.is64bit then
     "64"
-  else 
-    throw "Oops, unknown system: ${a.stdenv.system}";
+  else if a.stdenv.isi686 then
+    "32"
+  else
+    builtins.trace "assuming ${a.stdenv.system} is 32 bits" "32";
 
   doBuildJ = a.fullDepEntry ''
     sed -i bin/jconfig -e 's@bits=32@bits=${bits}@g; s@readline=0@readline=1@; s@LIBREADLINE=""@LIBREADLINE=" -lreadline "@'
@@ -69,7 +69,7 @@ rec {
       raskin
     ];
     platforms = with a.lib.platforms;
-      linux;
+      unix;
     license = a.lib.licenses.gpl3Plus;
   };
   passthru = {