From adef4cf5eaef039bee468cfde8f4f216e4d5d475 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Tue, 19 May 2026 00:32:18 +0200 Subject: [PATCH 1/2] ccsymbols: use installFonts --- pkgs/by-name/cc/ccsymbols/package.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/cc/ccsymbols/package.nix b/pkgs/by-name/cc/ccsymbols/package.nix index f9132d165e3e..52d3092c1779 100644 --- a/pkgs/by-name/cc/ccsymbols/package.nix +++ b/pkgs/by-name/cc/ccsymbols/package.nix @@ -2,6 +2,7 @@ lib, stdenvNoCC, fetchurl, + installFonts, unzip, }: @@ -16,15 +17,15 @@ stdenvNoCC.mkDerivation rec { sourceRoot = "."; - nativeBuildInputs = [ unzip ]; + outputs = [ + "out" + "webfont" + ]; - installPhase = '' - runHook preInstall - - install -Dm644 CCSymbols.* -t $out/share/fonts/ccsymbols - - runHook postInstall - ''; + nativeBuildInputs = [ + installFonts + unzip + ]; passthru = { inherit pname version; }; From 5ecf636f89e469d3e0c0775382bc8ada62048b36 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Tue, 19 May 2026 00:33:22 +0200 Subject: [PATCH 2/2] ccsymbols: use finalAttrs --- pkgs/by-name/cc/ccsymbols/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/cc/ccsymbols/package.nix b/pkgs/by-name/cc/ccsymbols/package.nix index 52d3092c1779..34c9c106cd0c 100644 --- a/pkgs/by-name/cc/ccsymbols/package.nix +++ b/pkgs/by-name/cc/ccsymbols/package.nix @@ -6,12 +6,12 @@ unzip, }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "ccsymbols"; version = "2020-04-19"; src = fetchurl { - url = "https://www.ctrl.blog/file/${version}_cc-symbols.zip"; + url = "https://www.ctrl.blog/file/${finalAttrs.version}_cc-symbols.zip"; hash = "sha256-hkARhb8T6VgGAybYkVuPuebjhuk1dwiBJ1bZMwvYpMY="; }; @@ -27,7 +27,7 @@ stdenvNoCC.mkDerivation rec { unzip ]; - passthru = { inherit pname version; }; + passthru = { inherit (finalAttrs) pname version; }; meta = { description = "Creative Commons symbol font"; @@ -36,4 +36,4 @@ stdenvNoCC.mkDerivation rec { license = lib.licenses.publicDomain; platforms = lib.platforms.all; }; -} +})