From d9d2958104e59a016388d5246851e8f26177f145 Mon Sep 17 00:00:00 2001 From: SkohTV Date: Wed, 1 Apr 2026 09:49:13 -0400 Subject: [PATCH 1/2] xkcd-font: adopt by pancaek --- pkgs/by-name/xk/xkcd-font/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/xk/xkcd-font/package.nix b/pkgs/by-name/xk/xkcd-font/package.nix index a1cc647f0fe6..aab480042e9d 100644 --- a/pkgs/by-name/xk/xkcd-font/package.nix +++ b/pkgs/by-name/xk/xkcd-font/package.nix @@ -29,6 +29,6 @@ stdenvNoCC.mkDerivation { homepage = "https://github.com/ipython/xkcd-font"; license = lib.licenses.cc-by-nc-30; platforms = lib.platforms.all; - maintainers = [ ]; + maintainers = with lib.maintainers; [ pancaek ]; }; } From 75ed07429729eab8e3f125b27c613f042e0ca7c1 Mon Sep 17 00:00:00 2001 From: SkohTV Date: Wed, 1 Apr 2026 09:49:53 -0400 Subject: [PATCH 2/2] xkcd-font: use installFonts hook --- pkgs/by-name/xk/xkcd-font/package.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/xk/xkcd-font/package.nix b/pkgs/by-name/xk/xkcd-font/package.nix index aab480042e9d..649cdbbb6794 100644 --- a/pkgs/by-name/xk/xkcd-font/package.nix +++ b/pkgs/by-name/xk/xkcd-font/package.nix @@ -2,6 +2,7 @@ lib, stdenvNoCC, fetchFromGitHub, + installFonts, }: stdenvNoCC.mkDerivation { @@ -15,14 +16,14 @@ stdenvNoCC.mkDerivation { hash = "sha256-1DgSx2L+OpXuPVSXbbl/hcZUyBK9ikPyGWuk6wNzlwc="; }; - installPhase = '' - runHook preInstall + preInstall = "rm xkcd/build/xkcd.otf"; - install -Dm444 -t $out/share/fonts/opentype/ xkcd/build/xkcd.otf - install -Dm444 -t $out/share/fonts/truetype/ xkcd-script/font/xkcd-script.ttf + nativeBuildInputs = [ installFonts ]; - runHook postInstall - ''; + outputs = [ + "out" + "webfont" + ]; meta = { description = "Xkcd font";