From d2efe7785ee6f3c911dc0ff2e3333e22abda76e1 Mon Sep 17 00:00:00 2001
From: Victor van Poppelen <vvanpo@gmail.com>
Date: Thu, 31 Jul 2014 00:38:00 -0400
Subject: [PATCH 1/2] plan9port: 	- Update to 20140306 	- Fixed libXt
 dependency.  The compiler could not find X11/IntrinsicP.h, even though it is
 available through the nix store.  I think there must be some issue with the
 9c compiler being used and not obeying the CFLAGS that nix is supposed to
 pass.  There are probably other dependencies I'm missing, but 9c found in my
 /usr/include.

---
 pkgs/tools/system/plan9port/builder.sh  |  6 +++++-
 pkgs/tools/system/plan9port/default.nix | 13 ++++++++-----
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/system/plan9port/builder.sh b/pkgs/tools/system/plan9port/builder.sh
index 729da7015d9..2adab988c57 100644
--- a/pkgs/tools/system/plan9port/builder.sh
+++ b/pkgs/tools/system/plan9port/builder.sh
@@ -2,7 +2,11 @@ source $stdenv/setup
 
 tar xvfz $src
 
-cd plan9
+cd plan9port
+
+cflags="echo \"CFLAGS='-I${libXt}/include'\" >> \$PLAN9/config"
+
+sed -i "43i\\${cflags}" INSTALL
 
 for p in $patches; do
   echo "applying patch $p"
diff --git a/pkgs/tools/system/plan9port/default.nix b/pkgs/tools/system/plan9port/default.nix
index f166f198b70..a1771feb8eb 100644
--- a/pkgs/tools/system/plan9port/default.nix
+++ b/pkgs/tools/system/plan9port/default.nix
@@ -1,19 +1,20 @@
-{stdenv, fetchurl, libX11
+{stdenv, fetchurl, libX11, libXt
 , xproto ? null
-, libXt ? null
 , xextproto ? null
 , libXext ? null }:
 
 stdenv.mkDerivation rec {
-  name = "plan9port-20140228";
+  name = "plan9port-20140306";
 
   patches = [ ./fontsrv.patch ];
 
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = "http://swtch.com/plan9port/${name}.tgz";
-    sha256 = "1l7nsjfrrcq0l43kw0f1437jz3nyl9qw7i2vn0sbmcsv5vmsj0cr";
+    url = "https://plan9port.googlecode.com/files/${name}.tgz";
+	# Google code is much faster than swtch
+    # url = "http://swtch.com/plan9port/${name}.tgz";
+    sha256 = "1sza12j3db7i54r3pzli8wmby6aiyzmyfj8w0nidmawkwv6jdf6b";
   };
 
   buildInputs = stdenv.lib.optionals (!stdenv.isDarwin) [ libX11 xproto libXt xextproto libXext ];
@@ -23,4 +24,6 @@ stdenv.mkDerivation rec {
     description = "Plan 9 from User Space";
     license="free";
   };
+
+  inherit libXt;
 }

From f4c851f854afb819185d7319ca07b2b9785f0ede Mon Sep 17 00:00:00 2001
From: Victor van Poppelen <vvanpo@gmail.com>
Date: Thu, 31 Jul 2014 14:00:28 -0400
Subject: [PATCH 2/2] plan9port: builder.sh called install script twice,
 meaning a redundant recompile.

---
 pkgs/tools/system/plan9port/builder.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/tools/system/plan9port/builder.sh b/pkgs/tools/system/plan9port/builder.sh
index 2adab988c57..f97706fa719 100644
--- a/pkgs/tools/system/plan9port/builder.sh
+++ b/pkgs/tools/system/plan9port/builder.sh
@@ -13,7 +13,6 @@ for p in $patches; do
   patch -p1 < $p
 done
 
-./INSTALL -b
 ./INSTALL -r $out/plan9
 
 export PLAN9=$out/plan9