summary refs log tree commit diff
path: root/pkgs/applications/office
diff options
context:
space:
mode:
authorSandro <sandro.jaeckel@gmail.com>2020-11-25 12:51:41 +0100
committerGitHub <noreply@github.com>2020-11-25 12:51:41 +0100
commitb000c18b02fcad6e6b64b54e2203aa225ce808a5 (patch)
tree0c6ac8d03f3800cee1cbfc27337c634ef16f9156 /pkgs/applications/office
parent9f071f2d067b13a0988b75dd4ec2cc96ea9103aa (diff)
parentf6bfc2c38be89d26f2aa60823656355049ffe621 (diff)
downloadnixpkgs-b000c18b02fcad6e6b64b54e2203aa225ce808a5.tar
nixpkgs-b000c18b02fcad6e6b64b54e2203aa225ce808a5.tar.gz
nixpkgs-b000c18b02fcad6e6b64b54e2203aa225ce808a5.tar.bz2
nixpkgs-b000c18b02fcad6e6b64b54e2203aa225ce808a5.tar.lz
nixpkgs-b000c18b02fcad6e6b64b54e2203aa225ce808a5.tar.xz
nixpkgs-b000c18b02fcad6e6b64b54e2203aa225ce808a5.tar.zst
nixpkgs-b000c18b02fcad6e6b64b54e2203aa225ce808a5.zip
Merge pull request #101539 from Luflosi/update/wordgrinder
wordgrinder: 0.7.2 -> 0.8
Diffstat (limited to 'pkgs/applications/office')
-rw-r--r--pkgs/applications/office/wordgrinder/default.nix8
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/applications/office/wordgrinder/default.nix b/pkgs/applications/office/wordgrinder/default.nix
index 6438bed4828..e50e319f319 100644
--- a/pkgs/applications/office/wordgrinder/default.nix
+++ b/pkgs/applications/office/wordgrinder/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   pname = "wordgrinder";
-  version = "0.7.2";
+  version = "0.8";
 
   src = fetchFromGitHub {
     repo = "wordgrinder";
     owner = "davidgiven";
     rev = version;
-    sha256 = "08lnq5wmspfqdjmqm15gizcq0xr7mg4h62qhvwj63v0sd6ks1cal";
+    sha256 = "124d1bnn2aqs6ik8pdazzni6a0583prz9lfdjrbwyb97ipqga9pm";
   };
 
   makeFlags = [
@@ -25,6 +25,7 @@ stdenv.mkDerivation rec {
 
   dontUseNinjaBuild = true;
   dontUseNinjaInstall = true;
+  dontConfigure = true;
 
   nativeBuildInputs = [
     pkgconfig
@@ -33,11 +34,12 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    libXft
     lua52Packages.lua
     ncurses
     readline
     zlib
+  ] ++ stdenv.lib.optionals stdenv.isLinux [
+    libXft
   ];
 
   # To be able to find <Xft.h>