From 443687c31a2ac7e2b9522c163abaa58a945449ab Mon Sep 17 00:00:00 2001
From: Victor Calvert <calvertvl@gmail.com>
Date: Fri, 5 Jan 2018 23:21:04 -0500
Subject: [PATCH] wordgrinder: 0.6 -> 0.7.1

---
 .../office/wordgrinder/default.nix             | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/office/wordgrinder/default.nix b/pkgs/applications/office/wordgrinder/default.nix
index 67f7e2816a4..da096acc27f 100644
--- a/pkgs/applications/office/wordgrinder/default.nix
+++ b/pkgs/applications/office/wordgrinder/default.nix
@@ -1,24 +1,32 @@
 { stdenv, fetchFromGitHub, pkgconfig, makeWrapper
-, lua52Packages, libXft, ncurses, readline, zlib }:
+, lua52Packages, libXft, ncurses, ninja, readline, zlib }:
 
 stdenv.mkDerivation rec {
   name = "wordgrinder-${version}";
-  version = "0.6-db14181";
+  version = "0.7.1";
 
   src = fetchFromGitHub {
     repo = "wordgrinder";
     owner = "davidgiven";
-    rev = "db141815e8bd1da6e684a1142a59492e516f3041";
-    sha256 = "1l1jqzcqiwnc8r1igfi7ay4pzzhdhss81znnmfr4rc1ia8bpdjc2";
+    rev = "${version}";
+    sha256 = "19n4vn8zyvcvgwygm63d3jcmiwh6a2ikrrqqmkm8fvhdvwkqgr9k";
   };
 
   makeFlags = [
     "PREFIX=$(out)"
     "LUA_INCLUDE=${lua52Packages.lua}/include"
     "LUA_LIB=${lua52Packages.lua}/lib/liblua.so"
+    "XFT_PACKAGE=--libs=\{-lX11 -lXft\}"
   ];
 
-  nativeBuildInputs = [ pkgconfig makeWrapper ];
+  dontUseNinjaBuild = true;
+  dontUseNinjaInstall = true;
+
+  nativeBuildInputs = [
+    pkgconfig
+    makeWrapper
+    ninja
+  ];
 
   buildInputs = [
     libXft