diff options
author | Vincent Laporte <vbgl@users.noreply.github.com> | 2020-09-21 08:01:37 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-09-21 08:01:37 +0200 |
commit | 4e155d6be99492803dadb443f9a43458214cb00d (patch) | |
tree | 848a987b5b240fa7bbf100a6eb03bc2a08581ae8 /pkgs/applications/graphics/fontmatrix | |
parent | a4afd525cb9ab90b71977142489ac154a701b7d0 (diff) |
fontmatrix: 0.6.0 → 0.6.0-qt5 (#97800)
This is an unofficial port of Fontmatrix 0.6.0 to Qt5 Co-authored-by: symphorien <symphorien@users.noreply.github.com>
Diffstat (limited to 'pkgs/applications/graphics/fontmatrix')
-rw-r--r-- | pkgs/applications/graphics/fontmatrix/default.nix | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/pkgs/applications/graphics/fontmatrix/default.nix b/pkgs/applications/graphics/fontmatrix/default.nix index 99ca119b3bcd3..3c67b11844d07 100644 --- a/pkgs/applications/graphics/fontmatrix/default.nix +++ b/pkgs/applications/graphics/fontmatrix/default.nix @@ -1,26 +1,32 @@ -{ stdenv, fetchFromGitHub, cmake, qt4 }: +{ lib, mkDerivation, fetchpatch, fetchFromGitHub, cmake, qttools, qtwebkit }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "fontmatrix"; - version = "0.6.0"; + version = "0.6.0-qt5"; src = fetchFromGitHub { - owner = "fontmatrix"; + owner = "fcoiffie"; repo = "fontmatrix"; - rev = "v${version}"; - sha256 = "0aqndj1jhm6hjpwmj1qm92z2ljh7w78a5ff5ag47qywqha1ngn05"; + rev = "1ff8382d8c85c18d9962918f461341ff4fe21993"; + sha256 = "0yx1gbsjj9ddq1kiqplif1w5x5saw250zbmhmd4phqmaqzr60w0h"; }; - buildInputs = [ qt4 ]; + # Add missing QAction include + patches = [ (fetchpatch { + url = "https://github.com/fcoiffie/fontmatrix/commit/dc6de8c414ae21516b72daead79c8db88309b102.patch"; + sha256 = "092860fdyf5gq67jqfxnlgwzjgpizi6j0njjv3m62aiznrhig7c8"; + })]; + + buildInputs = [ qttools qtwebkit ]; nativeBuildInputs = [ cmake ]; hardeningDisable = [ "format" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Fontmatrix is a free/libre font explorer for Linux, Windows and Mac"; homepage = "https://github.com/fontmatrix/fontmatrix"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; }; } |