From c40578ccbba98ce771de3dd2916515b772136852 Mon Sep 17 00:00:00 2001
From: Ram Kromberg <ramkromberg@mail.com>
Date: Sun, 4 Sep 2016 15:52:34 +0300
Subject: [PATCH] plan9port 2015-11-10 -> 2016-04-18 (#18228)

---
 pkgs/tools/system/plan9port/default.nix | 38 ++++++++++++++-----------
 1 file changed, 22 insertions(+), 16 deletions(-)

diff --git a/pkgs/tools/system/plan9port/default.nix b/pkgs/tools/system/plan9port/default.nix
index f7668e1374af..798d6820cf46 100644
--- a/pkgs/tools/system/plan9port/default.nix
+++ b/pkgs/tools/system/plan9port/default.nix
@@ -8,13 +8,13 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "plan9port-2015-11-10";
+  name = "plan9port-2016-04-18";
 
   src = fetchgit {
     # Latest, same as on github, google code is old
     url = "https://plan9port.googlesource.com/plan9";
-    rev = "0d2dfbc";
-    sha256 = "1h16wvps4rfkjim2ihkmniw8wzl7yill5910larci1c70x6zcicf";
+    rev = "35d43924484b88b9816e40d2f6bff4547f3eec47";
+    sha256 = "1dvg580rkav09fra2gnrzh271b4fw6bgqfv4ib7ds5k3j55ahcdc";
   };
 
   patches = [
@@ -29,23 +29,29 @@ stdenv.mkDerivation rec {
     find . -type f \
       -exec sed -i -e 's/_SVID_SOURCE/_DEFAULT_SOURCE/g' {} \; \
       -exec sed -i -e 's/_BSD_SOURCE/_DEFAULT_SOURCE/g' {} \;
+  '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
+    #add missing ctrl+c\z\x\v keybind for non-Darwin
+    substituteInPlace src/cmd/acme/text.c \
+      --replace "case Kcmd+'c':" "case 0x03: case Kcmd+'c':" \
+      --replace "case Kcmd+'z':" "case 0x1a: case Kcmd+'z':" \
+      --replace "case Kcmd+'x':" "case 0x18: case Kcmd+'x':" \
+      --replace "case Kcmd+'v':" "case 0x16: case Kcmd+'v':"
   '';
 
   builder = ./builder.sh;
 
   NIX_LDFLAGS="-lgcc_s";
-  buildInputs = stdenv.lib.optionals
-                  (!stdenv.isDarwin)
-                  [ which
-                    perl
-                    libX11
-                    fontconfig
-                    xproto
-                    libXt
-                    xextproto
-                    libXext
-                    freetype #fontsrv wants ft2build.h. provides system fonts for acme and sam.
-                  ];
+  buildInputs = stdenv.lib.optionals (!stdenv.isDarwin) [
+    which
+    perl
+    libX11
+    fontconfig
+    xproto
+    libXt
+    xextproto
+    libXext
+    freetype #fontsrv wants ft2build.h. provides system fonts for acme and sam.
+  ];
 
   enableParallelBuilding = true;
 
@@ -53,7 +59,7 @@ stdenv.mkDerivation rec {
     homepage = "http://swtch.com/plan9port/";
     description = "Plan 9 from User Space";
     license = licenses.lpl-102;
-    maintainers = with stdenv.lib.maintainers; [ ftrvxmtrx kovirobi ];
+    maintainers = with maintainers; [ ftrvxmtrx kovirobi ];
     platforms = platforms.unix;
   };