From 4e155d6be99492803dadb443f9a43458214cb00d Mon Sep 17 00:00:00 2001
From: Vincent Laporte <vbgl@users.noreply.github.com>
Date: Mon, 21 Sep 2020 08:01:37 +0200
Subject: [PATCH] =?UTF-8?q?fontmatrix:=200.6.0=20=E2=86=92=200.6.0-qt5=20(?=
=?UTF-8?q?#97800)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This is an unofficial port of Fontmatrix 0.6.0 to Qt5
Co-authored-by: symphorien <symphorien@users.noreply.github.com>
---
.../graphics/fontmatrix/default.nix | 24 ++++++++++++-------
pkgs/top-level/all-packages.nix | 2 +-
2 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/pkgs/applications/graphics/fontmatrix/default.nix b/pkgs/applications/graphics/fontmatrix/default.nix
index 99ca119b3bc..3c67b11844d 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;
};
}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f2a608f4dff..cd2f01f6345 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -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 { };