From bc3d169fccc80484f38c5a0c62fa63fb31aef12c Mon Sep 17 00:00:00 2001 From: SkohTV Date: Wed, 1 Apr 2026 09:27:27 -0400 Subject: [PATCH 1/3] smiley-sans: adopt by pancaek --- pkgs/by-name/sm/smiley-sans/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/sm/smiley-sans/package.nix b/pkgs/by-name/sm/smiley-sans/package.nix index e792dd2d2ef8..1be07fb9383f 100644 --- a/pkgs/by-name/sm/smiley-sans/package.nix +++ b/pkgs/by-name/sm/smiley-sans/package.nix @@ -30,7 +30,7 @@ stdenvNoCC.mkDerivation rec { homepage = "https://atelier-anchor.com/typefaces/smiley-sans/"; changelog = "https://github.com/atelier-anchor/smiley-sans/blob/main/CHANGELOG.md"; license = lib.licenses.ofl; - maintainers = [ ]; + maintainers = with lib.maintainers; [ pancaek ]; platforms = lib.platforms.all; }; } From 654b5f555587446ac2a69600c406ab7a55ec3934 Mon Sep 17 00:00:00 2001 From: SkohTV Date: Wed, 1 Apr 2026 09:28:28 -0400 Subject: [PATCH 2/3] smiley-sans: use installFonts hook --- pkgs/by-name/sm/smiley-sans/package.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/sm/smiley-sans/package.nix b/pkgs/by-name/sm/smiley-sans/package.nix index 1be07fb9383f..210eda13cbff 100644 --- a/pkgs/by-name/sm/smiley-sans/package.nix +++ b/pkgs/by-name/sm/smiley-sans/package.nix @@ -3,6 +3,7 @@ stdenvNoCC, fetchzip, nix-update-script, + installFonts, }: stdenvNoCC.mkDerivation rec { @@ -15,13 +16,12 @@ stdenvNoCC.mkDerivation rec { stripRoot = false; }; - installPhase = '' - runHook preInstall - install -Dm644 -t $out/share/fonts/opentype *.otf - install -Dm644 -t $out/share/fonts/truetype *.ttf - install -Dm644 -t $out/share/fonts/woff2 *.woff2 - runHook postInstall - ''; + nativeBuildInputs = [ installFonts ]; + + outputs = [ + "out" + "webfont" + ]; passthru.updateScript = nix-update-script { }; From 7e4b58921565b8b7dbe711c9b7f2b622aa80c2f9 Mon Sep 17 00:00:00 2001 From: SkohTV Date: Wed, 1 Apr 2026 09:29:10 -0400 Subject: [PATCH 3/3] smiley-sans: switch to finalAttrs --- pkgs/by-name/sm/smiley-sans/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sm/smiley-sans/package.nix b/pkgs/by-name/sm/smiley-sans/package.nix index 210eda13cbff..2a56f55f9e44 100644 --- a/pkgs/by-name/sm/smiley-sans/package.nix +++ b/pkgs/by-name/sm/smiley-sans/package.nix @@ -6,12 +6,12 @@ installFonts, }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "smiley-sans"; version = "2.0.1"; src = fetchzip { - url = "https://github.com/atelier-anchor/smiley-sans/releases/download/v${version}/smiley-sans-v${version}.zip"; + url = "https://github.com/atelier-anchor/smiley-sans/releases/download/v${finalAttrs.version}/smiley-sans-v${finalAttrs.version}.zip"; sha256 = "sha256-p6DwX5MBPemAfV99L9ayLkEWro31ip4tf+wBQr8mkbs="; stripRoot = false; }; @@ -33,4 +33,4 @@ stdenvNoCC.mkDerivation rec { maintainers = with lib.maintainers; [ pancaek ]; platforms = lib.platforms.all; }; -} +})