From 2da528753ce28680de7d9b16ac46b1730154b2e1 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Sun, 26 Apr 2026 06:27:42 +0200 Subject: [PATCH 1/3] libre-baskerville: use installFonts --- pkgs/by-name/li/libre-baskerville/package.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/li/libre-baskerville/package.nix b/pkgs/by-name/li/libre-baskerville/package.nix index c4ac0287c394..cbb81e4722ad 100644 --- a/pkgs/by-name/li/libre-baskerville/package.nix +++ b/pkgs/by-name/li/libre-baskerville/package.nix @@ -2,6 +2,7 @@ lib, stdenvNoCC, fetchFromGitHub, + installFonts, }: stdenvNoCC.mkDerivation rec { @@ -15,13 +16,10 @@ stdenvNoCC.mkDerivation rec { hash = "sha256-1EXi1hxFpc7pFsLbEj1xs9LqjeIf3XBol/8HdKNROUU="; }; - installPhase = '' - runHook preInstall + nativeBuildInputs = [ installFonts ]; - install -m444 -Dt $out/share/fonts/truetype *.ttf + postInstall = '' install -m444 -Dt $out/share/doc/${pname}-${version} README.md FONTLOG.txt - - runHook postInstall ''; meta = { From c5eafc824dd418995b5e9457ab6f1bf8bb9181d3 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Sun, 26 Apr 2026 06:28:17 +0200 Subject: [PATCH 2/3] libre-baskerville: move to finalAttrs --- pkgs/by-name/li/libre-baskerville/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/li/libre-baskerville/package.nix b/pkgs/by-name/li/libre-baskerville/package.nix index cbb81e4722ad..fbbdbea1d3b5 100644 --- a/pkgs/by-name/li/libre-baskerville/package.nix +++ b/pkgs/by-name/li/libre-baskerville/package.nix @@ -5,7 +5,7 @@ installFonts, }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "libre-baskerville"; version = "1.000"; @@ -19,7 +19,7 @@ stdenvNoCC.mkDerivation rec { nativeBuildInputs = [ installFonts ]; postInstall = '' - install -m444 -Dt $out/share/doc/${pname}-${version} README.md FONTLOG.txt + install -m444 -Dt $out/share/doc/${finalAttrs.pname}-${finalAttrs.version} README.md FONTLOG.txt ''; meta = { @@ -35,4 +35,4 @@ stdenvNoCC.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.all; }; -} +}) From 412b84a85b7a8f6d4b6a8ad1fd0f7409d5f969ab Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Sun, 26 Apr 2026 06:30:36 +0200 Subject: [PATCH 3/3] libre-baskerville: add pancaek as maintainer --- pkgs/by-name/li/libre-baskerville/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/li/libre-baskerville/package.nix b/pkgs/by-name/li/libre-baskerville/package.nix index fbbdbea1d3b5..bc7cedf6ed14 100644 --- a/pkgs/by-name/li/libre-baskerville/package.nix +++ b/pkgs/by-name/li/libre-baskerville/package.nix @@ -32,7 +32,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { ''; homepage = "http://www.impallari.com/projects/overview/libre-baskerville"; license = lib.licenses.ofl; - maintainers = [ ]; + maintainers = with lib.maintainers; [ pancaek ]; platforms = lib.platforms.all; }; })