From 5fcf27a29bcb5fbe67e66870084f966de4edac68 Mon Sep 17 00:00:00 2001 From: Martin Joerg Date: Sun, 25 May 2025 07:47:14 +0000 Subject: [PATCH] font-manager: 0.9.2 -> 0.9.4 https://github.com/FontManager/font-manager/raw/refs/tags/0.9.4/CHANGELOG https://github.com/FontManager/font-manager/compare/refs/tags/0.9.2...refs/tags/0.9.4 --- pkgs/by-name/fo/font-manager/package.nix | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/fo/font-manager/package.nix b/pkgs/by-name/fo/font-manager/package.nix index 243c36a26c87..c74d5b86e39f 100644 --- a/pkgs/by-name/fo/font-manager/package.nix +++ b/pkgs/by-name/fo/font-manager/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, meson, ninja, gettext, @@ -16,6 +17,7 @@ gsettings-desktop-schemas, gtk4, adwaita-icon-theme, + libarchive, desktop-file-utils, nix-update-script, wrapGAppsHook4, @@ -27,17 +29,26 @@ webkitgtk_6_0, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "font-manager"; - version = "0.9.2"; + version = "0.9.4"; src = fetchFromGitHub { owner = "FontManager"; repo = "font-manager"; - rev = version; - hash = "sha256-x7ZRC/xwF6Y2BhbtApVZ4hPZGNGaJiilqpxLyax9r2g="; + tag = finalAttrs.version; + hash = "sha256-hggRvwMy/D2jc98CQPc7GChTV9+zYbYHPMENf/8Uq9s="; }; + patches = [ + # TODO: drop this patch when updating beyond version 0.9.4 + (fetchpatch { + name = "fix-reproducible-build-issue.patch"; + url = "https://github.com/FontManager/font-manager/commit/cc0c148d90741e39615e3380d283f684a052dd94.patch"; + hash = "sha256-bRn+jVjBu6ZqmQCErgcqxv6OyFa4hkPYB5bvK7rEibA="; + }) + ]; + nativeBuildInputs = [ pkg-config meson @@ -61,6 +72,7 @@ stdenv.mkDerivation rec { gsettings-desktop-schemas # for font settings gtk4 adwaita-icon-theme + libarchive ] ++ lib.optionals withWebkit [ glib-networking # for SSL so that Google Fonts can load @@ -77,6 +89,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://fontmanager.github.io/"; + changelog = "https://github.com/FontManager/font-manager/raw/refs/tags/${finalAttrs.version}/CHANGELOG"; description = "Simple font management for GTK desktop environments"; mainProgram = "font-manager"; longDescription = '' @@ -92,4 +105,4 @@ stdenv.mkDerivation rec { platforms = platforms.unix; maintainers = [ maintainers.romildo ]; }; -} +})