diff options
| author | adisbladis <adisbladis@gmail.com> | 2018-01-06 15:44:14 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-06 15:44:14 +0800 |
| commit | acb363fb453a0e1641a72f462752ce67c49681e7 (patch) | |
| tree | 2d9bfbf23f0f47fb4c1deaf4dfe5d86d88236cef /pkgs/applications/office | |
| parent | 75c5a66dc60cf8046f325e4051416098fcffac11 (diff) | |
| parent | 443687c31a2ac7e2b9522c163abaa58a945449ab (diff) | |
| download | nixlib-acb363fb453a0e1641a72f462752ce67c49681e7.tar nixlib-acb363fb453a0e1641a72f462752ce67c49681e7.tar.gz nixlib-acb363fb453a0e1641a72f462752ce67c49681e7.tar.bz2 nixlib-acb363fb453a0e1641a72f462752ce67c49681e7.tar.lz nixlib-acb363fb453a0e1641a72f462752ce67c49681e7.tar.xz nixlib-acb363fb453a0e1641a72f462752ce67c49681e7.tar.zst nixlib-acb363fb453a0e1641a72f462752ce67c49681e7.zip | |
Merge pull request #33507 from calvertvl/upd_wordgrinder-0.7.1
wordgrinder: 0.6 -> 0.7.1
Diffstat (limited to 'pkgs/applications/office')
| -rw-r--r-- | pkgs/applications/office/wordgrinder/default.nix | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/pkgs/applications/office/wordgrinder/default.nix b/pkgs/applications/office/wordgrinder/default.nix index 67f7e2816a48..da096acc27fc 100644 --- a/pkgs/applications/office/wordgrinder/default.nix +++ b/pkgs/applications/office/wordgrinder/default.nix @@ -1,24 +1,32 @@ { stdenv, fetchFromGitHub, pkgconfig, makeWrapper -, lua52Packages, libXft, ncurses, readline, zlib }: +, lua52Packages, libXft, ncurses, ninja, readline, zlib }: stdenv.mkDerivation rec { name = "wordgrinder-${version}"; - version = "0.6-db14181"; + version = "0.7.1"; src = fetchFromGitHub { repo = "wordgrinder"; owner = "davidgiven"; - rev = "db141815e8bd1da6e684a1142a59492e516f3041"; - sha256 = "1l1jqzcqiwnc8r1igfi7ay4pzzhdhss81znnmfr4rc1ia8bpdjc2"; + rev = "${version}"; + sha256 = "19n4vn8zyvcvgwygm63d3jcmiwh6a2ikrrqqmkm8fvhdvwkqgr9k"; }; makeFlags = [ "PREFIX=$(out)" "LUA_INCLUDE=${lua52Packages.lua}/include" "LUA_LIB=${lua52Packages.lua}/lib/liblua.so" + "XFT_PACKAGE=--libs=\{-lX11 -lXft\}" ]; - nativeBuildInputs = [ pkgconfig makeWrapper ]; + dontUseNinjaBuild = true; + dontUseNinjaInstall = true; + + nativeBuildInputs = [ + pkgconfig + makeWrapper + ninja + ]; buildInputs = [ libXft |