diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-05-07 17:46:11 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-05-07 17:46:11 +0000 |
| commit | 0a67dc6d2aa5f6ac3d08a12eb5e26d5fda5734ea (patch) | |
| tree | ad528e0ffd64d471f2bf250670c0732bff57e86b /nixpkgs/pkgs/applications/office/wordgrinder | |
| parent | 373507e28edeacd168b5c240840db2dac854882a (diff) | |
| parent | 2ec5e9595becf05b052ce4c61a05d87ce95d19af (diff) | |
| download | nixlib-0a67dc6d2aa5f6ac3d08a12eb5e26d5fda5734ea.tar nixlib-0a67dc6d2aa5f6ac3d08a12eb5e26d5fda5734ea.tar.gz nixlib-0a67dc6d2aa5f6ac3d08a12eb5e26d5fda5734ea.tar.bz2 nixlib-0a67dc6d2aa5f6ac3d08a12eb5e26d5fda5734ea.tar.lz nixlib-0a67dc6d2aa5f6ac3d08a12eb5e26d5fda5734ea.tar.xz nixlib-0a67dc6d2aa5f6ac3d08a12eb5e26d5fda5734ea.tar.zst nixlib-0a67dc6d2aa5f6ac3d08a12eb5e26d5fda5734ea.zip | |
Merge commit '2ec5e9595becf05b052ce4c61a05d87ce95d19af'
Diffstat (limited to 'nixpkgs/pkgs/applications/office/wordgrinder')
| -rw-r--r-- | nixpkgs/pkgs/applications/office/wordgrinder/default.nix | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/nixpkgs/pkgs/applications/office/wordgrinder/default.nix b/nixpkgs/pkgs/applications/office/wordgrinder/default.nix index 9518aaca878e..4271e3d17aa2 100644 --- a/nixpkgs/pkgs/applications/office/wordgrinder/default.nix +++ b/nixpkgs/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; |