diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2020-11-27 15:09:19 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-11-27 15:09:19 +0100 |
commit | b2a3891e12777fa5e16bc93bc95c0d5ba256ebaf (patch) | |
tree | 220c385a8657d85bb6b305819a1842a3b1f4079c /pkgs/applications/office/wordgrinder/default.nix | |
parent | 977848375167f4671a03ccc0dbf5896f4cf0d3fe (diff) | |
parent | be36f6f0a0ffbeef228a021f5a343f5ce7a183de (diff) | |
download | nixpkgs-b2a3891e12777fa5e16bc93bc95c0d5ba256ebaf.tar nixpkgs-b2a3891e12777fa5e16bc93bc95c0d5ba256ebaf.tar.gz nixpkgs-b2a3891e12777fa5e16bc93bc95c0d5ba256ebaf.tar.bz2 nixpkgs-b2a3891e12777fa5e16bc93bc95c0d5ba256ebaf.tar.lz nixpkgs-b2a3891e12777fa5e16bc93bc95c0d5ba256ebaf.tar.xz nixpkgs-b2a3891e12777fa5e16bc93bc95c0d5ba256ebaf.tar.zst nixpkgs-b2a3891e12777fa5e16bc93bc95c0d5ba256ebaf.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/office/wordgrinder/default.nix')
-rw-r--r-- | pkgs/applications/office/wordgrinder/default.nix | 8 |
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> |