From cd7d6b34535713f5dd737f784a739956ef9abe12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment?= Date: Thu, 9 Apr 2026 12:32:16 -0700 Subject: [PATCH] birdfont: modernize --- pkgs/tools/misc/birdfont/default.nix | 53 ++++++++++++++-------------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/pkgs/tools/misc/birdfont/default.nix b/pkgs/tools/misc/birdfont/default.nix index 534e3e588864..390b042e5a8e 100644 --- a/pkgs/tools/misc/birdfont/default.nix +++ b/pkgs/tools/misc/birdfont/default.nix @@ -1,24 +1,24 @@ { - lib, - stdenv, - fetchFromGitHub, - pkg-config, - python3, - xmlbird, + autoPatchelfHook, cairo, + fetchFromGitHub, gdk-pixbuf, - libgee, glib, - gtk3, - webkitgtk_4_1, - libnotify, - sqlite, - vala, gobject-introspection, gsettings-desktop-schemas, - wrapGAppsHook3, - autoPatchelfHook, + gtk3, + lib, + libgee, + libnotify, nix-update-script, + pkg-config, + python3, + sqlite, + stdenv, + vala, + webkitgtk_4_1, + wrapGAppsHook3, + xmlbird, }: stdenv.mkDerivation (finalAttrs: { @@ -29,33 +29,33 @@ stdenv.mkDerivation (finalAttrs: { owner = "johanmattssonm"; repo = "birdfont"; tag = "v${finalAttrs.version}"; - sha256 = "sha256-7xVjY/yH7pMlUBpQc5Gb4t4My24Mx5KkARVp2KSr+Iw="; + hash = "sha256-7xVjY/yH7pMlUBpQc5Gb4t4My24Mx5KkARVp2KSr+Iw="; }; nativeBuildInputs = [ - python3 - pkg-config - vala - gobject-introspection - wrapGAppsHook3 autoPatchelfHook + gobject-introspection + pkg-config + python3 + vala + wrapGAppsHook3 ]; buildInputs = [ - xmlbird - libgee cairo gdk-pixbuf glib + gsettings-desktop-schemas gtk3 - webkitgtk_4_1 + libgee libnotify sqlite - gsettings-desktop-schemas + webkitgtk_4_1 + xmlbird ]; postPatch = '' substituteInPlace install.py \ - --replace 'platform.version()' '"Nix"' + --replace-fail 'platform.version()' '"Nix"' patchShebangs . ''; @@ -72,7 +72,8 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Font editor which can generate fonts in TTF, EOT, SVG and BIRDFONT format"; homepage = "https://birdfont.org"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Plus; + mainProgram = "birdfont"; maintainers = with lib.maintainers; [ drawbu ]; }; })