From a7941173c8964c576957f4935d058aeacc958fe8 Mon Sep 17 00:00:00 2001 From: Pablo Ovelleiro Corral Date: Wed, 23 Aug 2023 17:40:05 +0200 Subject: [PATCH] Switch from fork to original repo --- .../graphics/fontmatrix/default.nix | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/graphics/fontmatrix/default.nix b/pkgs/applications/graphics/fontmatrix/default.nix index 1b0121a16c95..f42ae0be249a 100644 --- a/pkgs/applications/graphics/fontmatrix/default.nix +++ b/pkgs/applications/graphics/fontmatrix/default.nix @@ -1,22 +1,22 @@ -{ lib, mkDerivation, fetchpatch, fetchFromGitHub, cmake, qttools, qtwebkit }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, qttools +, qtwebkit +}: mkDerivation rec { pname = "fontmatrix"; - version = "0.6.0"; + version = "0.9.100"; src = fetchFromGitHub { - owner = "fcoiffie"; + owner = "fontmatrix"; repo = "fontmatrix"; - rev = "1ff8382d8c85c18d9962918f461341ff4fe21993"; - sha256 = "0yx1gbsjj9ddq1kiqplif1w5x5saw250zbmhmd4phqmaqzr60w0h"; + rev = "v${version}"; + sha256 = "sha256-DtajGhx79DiecglXHja9q/TKVq8Jl2faQdA5Ib/yT88="; }; - # Add missing QAction include - patches = [ (fetchpatch { - url = "https://github.com/fcoiffie/fontmatrix/commit/dc6de8c414ae21516b72daead79c8db88309b102.patch"; - sha256 = "092860fdyf5gq67jqfxnlgwzjgpizi6j0njjv3m62aiznrhig7c8"; - })]; - buildInputs = [ qttools qtwebkit ]; nativeBuildInputs = [ cmake ];