From b711a6e9193b8759d9f65f5b3cf30dc7808c73f5 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Tue, 3 Mar 2026 02:17:06 +0100 Subject: [PATCH 1/2] cm_unicode: use installFonts --- pkgs/by-name/cm/cm_unicode/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/cm/cm_unicode/package.nix b/pkgs/by-name/cm/cm_unicode/package.nix index ce4488e3c6ce..239d0d9cbe5c 100644 --- a/pkgs/by-name/cm/cm_unicode/package.nix +++ b/pkgs/by-name/cm/cm_unicode/package.nix @@ -2,6 +2,7 @@ lib, stdenvNoCC, fetchurl, + installFonts, }: stdenvNoCC.mkDerivation rec { @@ -13,10 +14,11 @@ stdenvNoCC.mkDerivation rec { hash = "sha256-VIp+vk1IYbEHW15wMrfGVOPqg1zBZDpgFx+jlypOHCg="; }; - installPhase = '' + nativeBuildInputs = [ installFonts ]; + + InstallPhase = '' runHook preInstall - install -m444 -Dt $out/share/fonts/opentype *.otf install -m444 -Dt $out/share/doc/${pname}-${version} README FontLog.txt runHook postInstall From 4b013f0851fb32296eff62393750d1a57e9ef7aa Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Tue, 3 Mar 2026 02:19:15 +0100 Subject: [PATCH 2/2] cm_unicode: move to finalAttrs --- pkgs/by-name/cm/cm_unicode/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/cm/cm_unicode/package.nix b/pkgs/by-name/cm/cm_unicode/package.nix index 239d0d9cbe5c..8d5751b9d25a 100644 --- a/pkgs/by-name/cm/cm_unicode/package.nix +++ b/pkgs/by-name/cm/cm_unicode/package.nix @@ -5,12 +5,12 @@ installFonts, }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "cm-unicode"; version = "0.7.0"; src = fetchurl { - url = "mirror://sourceforge/cm-unicode/cm-unicode/${version}/${pname}-${version}-otf.tar.xz"; + url = "mirror://sourceforge/cm-unicode/cm-unicode/${finalAttrs.version}/cm-unicode-${finalAttrs.version}-otf.tar.xz"; hash = "sha256-VIp+vk1IYbEHW15wMrfGVOPqg1zBZDpgFx+jlypOHCg="; }; @@ -19,7 +19,7 @@ stdenvNoCC.mkDerivation rec { InstallPhase = '' runHook preInstall - install -m444 -Dt $out/share/doc/${pname}-${version} README FontLog.txt + install -m444 -Dt $out/share/doc/$cm-unicode-${finalAttrs.version} README FontLog.txt runHook postInstall ''; @@ -34,4 +34,4 @@ stdenvNoCC.mkDerivation rec { license = lib.licenses.ofl; platforms = lib.platforms.all; }; -} +})