From 31bee0cc7c6078f82be1562a2d1e105a0e1cb136 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Tue, 23 Apr 2019 21:46:47 +0200 Subject: [PATCH] wordgrinder: Fix build First I tried to fix the build like this: > This fixes the build of the wordgrinder package by disabling the build > of "xwordgrinder", the non-curses frontend of wordgrinder. > > For re-enabling the build, this patch shall be reverted and then go on > from there. > > I opted for disabling the x frontend of this program because the whole > purpose of this is to use a curses writing program (at least for me). > It seems that hacking around the new build system in nixpkgs is a > non-trivial task and I wanted to get this package out of the door as > fast as possible because I already delayed the fix by a few days (or is > it weeks already), so this is the simple fix. > > If someone wants to have the X frontend again, I can invest more time at > some point. But then the almighty aszlig came around and told me how to do it right. So here we go, with a patch from me that is acutally from aszlig (see #60122). This fixes the build. Signed-off-by: Matthias Beyer Signed-off-by: aszlig Fixes: 6b2bd330fa ("wordgrinder: Fix sha256 hash") Fixes: 19a3abc1b8 ("wordgrinder: 0.7.1 -> 0.7.2") Merges: https://github.com/NixOS/nixpkgs/pull/60122 Cc: @devhell --- pkgs/applications/office/wordgrinder/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/office/wordgrinder/default.nix b/pkgs/applications/office/wordgrinder/default.nix index 9518aaca878..4271e3d17aa 100644 --- a/pkgs/applications/office/wordgrinder/default.nix +++ b/pkgs/applications/office/wordgrinder/default.nix @@ -16,7 +16,11 @@ stdenv.mkDerivation rec { "PREFIX=$(out)" "LUA_INCLUDE=${lua52Packages.lua}/include" "LUA_LIB=${lua52Packages.lua}/lib/liblua.so" - ] ++ stdenv.lib.optional stdenv.isLinux "XFT_PACKAGE=--libs=\{-lX11 -lXft\}"; + ]; + + preBuild = stdenv.lib.optionalString stdenv.isLinux '' + makeFlagsArray+=('XFT_PACKAGE=--cflags={} --libs={-lX11 -lXft}') + ''; dontUseNinjaBuild = true; dontUseNinjaInstall = true;