summary refs log tree commit diff
path: root/pkgs/applications/office/wordgrinder
diff options
context:
space:
mode:
authorMatthias Beyer <mail@beyermatthias.de>2019-04-23 21:46:47 +0200
committeraszlig <aszlig@nix.build>2019-04-26 09:05:05 +0200
commit31bee0cc7c6078f82be1562a2d1e105a0e1cb136 (patch)
tree957db26ce06aef1d0f98aebd393f75dc29bed1dc /pkgs/applications/office/wordgrinder
parentef0174873a07b421b1b316c4da78c44136ad0b1c (diff)
downloadnixpkgs-31bee0cc7c6078f82be1562a2d1e105a0e1cb136.tar
nixpkgs-31bee0cc7c6078f82be1562a2d1e105a0e1cb136.tar.gz
nixpkgs-31bee0cc7c6078f82be1562a2d1e105a0e1cb136.tar.bz2
nixpkgs-31bee0cc7c6078f82be1562a2d1e105a0e1cb136.tar.lz
nixpkgs-31bee0cc7c6078f82be1562a2d1e105a0e1cb136.tar.xz
nixpkgs-31bee0cc7c6078f82be1562a2d1e105a0e1cb136.tar.zst
nixpkgs-31bee0cc7c6078f82be1562a2d1e105a0e1cb136.zip
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 <mail@beyermatthias.de>
Signed-off-by: aszlig <aszlig@nix.build>
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
Diffstat (limited to 'pkgs/applications/office/wordgrinder')
-rw-r--r--pkgs/applications/office/wordgrinder/default.nix6
1 files changed, 5 insertions, 1 deletions
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;