public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #33507 from calvertvl/upd_wordgrinder-0.7.1

Browse Source 
wordgrinder: 0.6 -> 0.7.1
This commit is contained in:
adisbladis 2018-01-06 15:44:14 +08:00 committed by GitHub
commit acb363fb45
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/applications/office/wordgrinder/default.nix
View File

@ -1,24 +1,32 @@
{ stdenv, fetchFromGitHub, pkgconfig, makeWrapper { stdenv, fetchFromGitHub, pkgconfig, makeWrapper
, lua52Packages, libXft, ncurses, readline, zlib }: , lua52Packages, libXft, ncurses, ninja, readline, zlib }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "wordgrinder-${version}"; name = "wordgrinder-${version}";
version = "0.6-db14181"; version = "0.7.1";
src = fetchFromGitHub { src = fetchFromGitHub {
repo = "wordgrinder"; repo = "wordgrinder";
owner = "davidgiven"; owner = "davidgiven";
rev = "db141815e8bd1da6e684a1142a59492e516f3041"; rev = "${version}";
sha256 = "1l1jqzcqiwnc8r1igfi7ay4pzzhdhss81znnmfr4rc1ia8bpdjc2"; sha256 = "19n4vn8zyvcvgwygm63d3jcmiwh6a2ikrrqqmkm8fvhdvwkqgr9k";
}; };
makeFlags = [ makeFlags = [
"PREFIX=$(out)" "PREFIX=$(out)"
"LUA_INCLUDE=${lua52Packages.lua}/include" "LUA_INCLUDE=${lua52Packages.lua}/include"
"LUA_LIB=${lua52Packages.lua}/lib/liblua.so" "LUA_LIB=${lua52Packages.lua}/lib/liblua.so"
"XFT_PACKAGE=--libs=\{-lX11 -lXft\}"
]; ];
nativeBuildInputs = [ pkgconfig makeWrapper ]; dontUseNinjaBuild = true;
dontUseNinjaInstall = true;
nativeBuildInputs = [
pkgconfig
makeWrapper
ninja
];
buildInputs = [ buildInputs = [
libXft libXft