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>

authored by

Vincent Laporte
symphorien
and committed by
GitHub
4e155d6b a4afd525

+16 -10
+15 -9
pkgs/applications/graphics/fontmatrix/default.nix
··· 1 - { stdenv, fetchFromGitHub, cmake, qt4 }: 1 + { lib, mkDerivation, fetchpatch, fetchFromGitHub, cmake, qttools, qtwebkit }: 2 2 3 - stdenv.mkDerivation rec { 3 + mkDerivation rec { 4 4 pname = "fontmatrix"; 5 - version = "0.6.0"; 5 + version = "0.6.0-qt5"; 6 6 7 7 src = fetchFromGitHub { 8 - owner = "fontmatrix"; 8 + owner = "fcoiffie"; 9 9 repo = "fontmatrix"; 10 - rev = "v${version}"; 11 - sha256 = "0aqndj1jhm6hjpwmj1qm92z2ljh7w78a5ff5ag47qywqha1ngn05"; 10 + rev = "1ff8382d8c85c18d9962918f461341ff4fe21993"; 11 + sha256 = "0yx1gbsjj9ddq1kiqplif1w5x5saw250zbmhmd4phqmaqzr60w0h"; 12 12 }; 13 13 14 - buildInputs = [ qt4 ]; 14 + # Add missing QAction include 15 + patches = [ (fetchpatch { 16 + url = "https://github.com/fcoiffie/fontmatrix/commit/dc6de8c414ae21516b72daead79c8db88309b102.patch"; 17 + sha256 = "092860fdyf5gq67jqfxnlgwzjgpizi6j0njjv3m62aiznrhig7c8"; 18 + })]; 19 + 20 + buildInputs = [ qttools qtwebkit ]; 15 21 16 22 nativeBuildInputs = [ cmake ]; 17 23 18 24 hardeningDisable = [ "format" ]; 19 25 20 - meta = with stdenv.lib; { 26 + meta = with lib; { 21 27 description = "Fontmatrix is a free/libre font explorer for Linux, Windows and Mac"; 22 28 homepage = "https://github.com/fontmatrix/fontmatrix"; 23 - license = licenses.gpl2; 29 + license = licenses.gpl2Plus; 24 30 platforms = platforms.linux; 25 31 }; 26 32 }
+1 -1
pkgs/top-level/all-packages.nix
··· 3752 3752 3753 3753 fontforge-fonttools = callPackage ../tools/misc/fontforge/fontforge-fonttools.nix {}; 3754 3754 3755 - fontmatrix = callPackage ../applications/graphics/fontmatrix {}; 3755 + fontmatrix = libsForQt514.callPackage ../applications/graphics/fontmatrix {}; 3756 3756 3757 3757 foremost = callPackage ../tools/system/foremost { }; 3758 3758