Skip to content

Commit

Permalink
fontmatrix: 0.6.0 → 0.6.0-qt5 (#97800)
Browse files Browse the repository at this point in the history
This is an unofficial port of Fontmatrix 0.6.0 to Qt5

Co-authored-by: symphorien <symphorien@users.noreply.github.com>
  • Loading branch information
vbgl and symphorien committed Sep 21, 2020
1 parent a4afd52 commit 4e155d6
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 10 deletions.
24 changes: 15 additions & 9 deletions 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;
};
}
2 changes: 1 addition & 1 deletion pkgs/top-level/all-packages.nix
Expand Up @@ -3752,7 +3752,7 @@ in

fontforge-fonttools = callPackage ../tools/misc/fontforge/fontforge-fonttools.nix {};

fontmatrix = callPackage ../applications/graphics/fontmatrix {};
fontmatrix = libsForQt514.callPackage ../applications/graphics/fontmatrix {};

foremost = callPackage ../tools/system/foremost { };

Expand Down

0 comments on commit 4e155d6

Please sign in to comment.