diff --git a/pkgs/by-name/cr/crimson/package.nix b/pkgs/by-name/cr/crimson/package.nix index 3a9233f7d8fc..4d4c4957ef88 100644 --- a/pkgs/by-name/cr/crimson/package.nix +++ b/pkgs/by-name/cr/crimson/package.nix @@ -2,6 +2,7 @@ lib, stdenvNoCC, fetchFromGitHub, + installFonts, }: stdenvNoCC.mkDerivation rec { @@ -15,13 +16,15 @@ stdenvNoCC.mkDerivation rec { hash = "sha256-Wp9L77q93TRmrAr0P4iH9gm0tqFY0X/xSsuFcd19aAE="; }; - installPhase = '' - runHook preInstall + outputs = [ + "out" + "webfont" + ]; - install -m444 -Dt $out/share/fonts/opentype "Desktop Fonts/OTF/"*.otf - install -m444 -Dt $out/share/doc/${pname}-${version} README.md + nativeBuildInputs = [ installFonts ]; - runHook postInstall + postInstall = '' + install -m444 -Dt $out/share/doc/${pname}-${version} README.md ''; meta = { diff --git a/pkgs/by-name/ge/geist-font/package.nix b/pkgs/by-name/ge/geist-font/package.nix index f3445bea363a..9bcbdf051735 100644 --- a/pkgs/by-name/ge/geist-font/package.nix +++ b/pkgs/by-name/ge/geist-font/package.nix @@ -2,6 +2,7 @@ lib, stdenvNoCC, fetchzip, + installFonts, }: stdenvNoCC.mkDerivation (finalAttrs: { @@ -17,13 +18,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { sourceRoot = "."; - installPhase = '' - runHook preInstall + outputs = [ + "out" + "webfont" + ]; - install -D source/fonts/{Geist,GeistMono}/otf/*.otf -t $out/share/fonts/opentype - - runHook postInstall - ''; + nativeBuildInputs = [ installFonts ]; meta = { description = "Font family created by Vercel in collaboration with Basement Studio"; diff --git a/pkgs/by-name/ra/raleway/package.nix b/pkgs/by-name/ra/raleway/package.nix index f1b0c6dd3d43..89b372783ba5 100644 --- a/pkgs/by-name/ra/raleway/package.nix +++ b/pkgs/by-name/ra/raleway/package.nix @@ -2,6 +2,7 @@ lib, fetchzip, stdenvNoCC, + installFonts, }: stdenvNoCC.mkDerivation (finalAttrs: { @@ -13,14 +14,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { hash = "sha256-itNHIMoRjiaqYAJoDNetkCquv47VAfel8MAzwsd//Ww="; }; - installPhase = '' - runHook preInstall + outputs = [ + "out" + "webfont" + ]; - install -D -m444 -t $out/share/fonts/truetype $src/static/TTF/*.ttf - install -D -m444 -t $out/share/fonts/opentype $src/static/OTF/*.otf - - runHook postInstall - ''; + nativeBuildInputs = [ installFonts ]; meta = { description = "Raleway is an elegant sans-serif typeface family";