diff --git a/pkgs/by-name/at/atkinson-hyperlegible-mono/package.nix b/pkgs/by-name/at/atkinson-hyperlegible-mono/package.nix index ac492f1dee9f..e8992b04834e 100644 --- a/pkgs/by-name/at/atkinson-hyperlegible-mono/package.nix +++ b/pkgs/by-name/at/atkinson-hyperlegible-mono/package.nix @@ -2,6 +2,7 @@ lib, stdenvNoCC, fetchFromGitHub, + installFonts, }: stdenvNoCC.mkDerivation { @@ -15,14 +16,13 @@ stdenvNoCC.mkDerivation { hash = "sha256-V0zWbNYT3RGO9vjX+GHfO38ywMozcZVJkBZH+8G5sC0="; }; + nativeBuildInputs = [ installFonts ]; + dontBuild = true; + # default installPhase invokes python, but we still want the font hook to run installPhase = '' runHook preInstall - - install -Dm644 -t $out/share/fonts/opentype fonts/otf/* - install -Dm644 -t $out/share/fonts/variable fonts/variable/* - runHook postInstall ''; diff --git a/pkgs/by-name/at/atkinson-hyperlegible-next/package.nix b/pkgs/by-name/at/atkinson-hyperlegible-next/package.nix index 639b4d5040da..008735231ebc 100644 --- a/pkgs/by-name/at/atkinson-hyperlegible-next/package.nix +++ b/pkgs/by-name/at/atkinson-hyperlegible-next/package.nix @@ -2,6 +2,7 @@ lib, stdenvNoCC, fetchFromGitHub, + installFonts, }: stdenvNoCC.mkDerivation { @@ -17,12 +18,11 @@ stdenvNoCC.mkDerivation { dontBuild = true; + nativeBuildInputs = [ installFonts ]; + + # default installPhase invokes python, but we still want the font hook to run installPhase = '' runHook preInstall - - install -Dm644 -t $out/share/fonts/opentype fonts/otf/* - install -Dm644 -t $out/share/fonts/variable fonts/variable/* - runHook postInstall ''; diff --git a/pkgs/by-name/ko/komika-fonts/package.nix b/pkgs/by-name/ko/komika-fonts/package.nix index 76b47f9d258b..c8a500f4ce71 100644 --- a/pkgs/by-name/ko/komika-fonts/package.nix +++ b/pkgs/by-name/ko/komika-fonts/package.nix @@ -2,6 +2,7 @@ stdenvNoCC, lib, fetchzip, + installFonts, variants ? [ "display" "hand" @@ -74,11 +75,8 @@ stdenvNoCC.mkDerivation { sourceRoot = "."; srcs = map (variant: fetchFont fontMap.${variant}) selectedFonts; - installPhase = '' - runHook preInstall - install -Dm444 **/*.ttf -t $out/share/fonts/ttf - runHook postInstall - ''; + + nativeBuildInputs = [ installFonts ]; meta = { homepage = "https://pedroreina.net/apostrophiclab/"; diff --git a/pkgs/by-name/ko/komikahuna/package.nix b/pkgs/by-name/ko/komikahuna/package.nix index be5a71eba227..ef0317e48581 100644 --- a/pkgs/by-name/ko/komikahuna/package.nix +++ b/pkgs/by-name/ko/komikahuna/package.nix @@ -2,6 +2,7 @@ stdenvNoCC, lib, fetchzip, + installFonts, }: stdenvNoCC.mkDerivation { @@ -14,11 +15,7 @@ stdenvNoCC.mkDerivation { stripRoot = false; }; - installPhase = '' - runHook preInstall - install -Dm444 *.ttf -t $out/share/fonts/ttf - runHook postInstall - ''; + nativeBuildInputs = [ installFonts ]; meta = { homepage = "https://pedroreina.net/apostrophiclab/0049-Komikahuna/komikahuna.html"; diff --git a/pkgs/by-name/ko/komikandy/package.nix b/pkgs/by-name/ko/komikandy/package.nix index fa3ee8d69c34..65891d45df6e 100644 --- a/pkgs/by-name/ko/komikandy/package.nix +++ b/pkgs/by-name/ko/komikandy/package.nix @@ -2,6 +2,7 @@ stdenvNoCC, lib, fetchzip, + installFonts, }: stdenvNoCC.mkDerivation { @@ -14,11 +15,7 @@ stdenvNoCC.mkDerivation { stripRoot = false; }; - installPhase = '' - runHook preInstall - install -Dm444 *.ttf -t $out/share/fonts/ttf - runHook postInstall - ''; + nativeBuildInputs = [ installFonts ]; meta = { homepage = "https://pedroreina.net/apostrophiclab/0122-Komikandy/komikandy.html"; diff --git a/pkgs/by-name/ko/komikazba/package.nix b/pkgs/by-name/ko/komikazba/package.nix index 159ef68da2cc..ccbac628ddc3 100644 --- a/pkgs/by-name/ko/komikazba/package.nix +++ b/pkgs/by-name/ko/komikazba/package.nix @@ -2,6 +2,7 @@ stdenvNoCC, lib, fetchzip, + installFonts, }: stdenvNoCC.mkDerivation { @@ -14,11 +15,7 @@ stdenvNoCC.mkDerivation { stripRoot = false; }; - installPhase = '' - runHook preInstall - install -Dm444 *.ttf -t $out/share/fonts/ttf - runHook postInstall - ''; + nativeBuildInputs = [ installFonts ]; meta = { homepage = "https://pedroreina.net/apostrophiclab/0052-Komikazba/komikazba.html"; diff --git a/pkgs/by-name/ko/komikaze/package.nix b/pkgs/by-name/ko/komikaze/package.nix index a203174dc643..3f5a7f86cdfa 100644 --- a/pkgs/by-name/ko/komikaze/package.nix +++ b/pkgs/by-name/ko/komikaze/package.nix @@ -2,6 +2,7 @@ stdenvNoCC, lib, fetchzip, + installFonts, }: stdenvNoCC.mkDerivation { @@ -14,11 +15,7 @@ stdenvNoCC.mkDerivation { stripRoot = false; }; - installPhase = '' - runHook preInstall - install -Dm444 *.ttf -t $out/share/fonts/ttf - runHook postInstall - ''; + nativeBuildInputs = [ installFonts ]; meta = { homepage = "https://pedroreina.net/apostrophiclab/0045-Komikaze/komikaze.html"; diff --git a/pkgs/by-name/ko/komikazoom/package.nix b/pkgs/by-name/ko/komikazoom/package.nix index 5bc73917c794..64d5767dfe36 100644 --- a/pkgs/by-name/ko/komikazoom/package.nix +++ b/pkgs/by-name/ko/komikazoom/package.nix @@ -2,6 +2,7 @@ stdenvNoCC, lib, fetchzip, + installFonts, }: stdenvNoCC.mkDerivation { @@ -14,11 +15,7 @@ stdenvNoCC.mkDerivation { stripRoot = false; }; - installPhase = '' - runHook preInstall - install -Dm444 *.ttf -t $out/share/fonts/ttf - runHook postInstall - ''; + nativeBuildInputs = [ installFonts ]; meta = { homepage = "https://pedroreina.net/apostrophiclab/0046-Komikazoom/komikazoom.html"; diff --git a/pkgs/by-name/pa/paratype-pt-mono/package.nix b/pkgs/by-name/pa/paratype-pt-mono/package.nix index a0573a129183..9ac174af376b 100644 --- a/pkgs/by-name/pa/paratype-pt-mono/package.nix +++ b/pkgs/by-name/pa/paratype-pt-mono/package.nix @@ -2,6 +2,7 @@ lib, stdenvNoCC, fetchFromGitHub, + installFonts, }: stdenvNoCC.mkDerivation { @@ -16,13 +17,7 @@ stdenvNoCC.mkDerivation { rootDir = "ofl/ptmono"; }; - installPhase = '' - runHook preInstall - - install -Dm644 *.ttf -t $out/share/fonts/truetype - - runHook postInstall - ''; + nativeBuildInputs = [ installFonts ]; meta = { homepage = "https://www.paratype.ru/catalog/font/pt/pt-mono"; diff --git a/pkgs/by-name/pa/paratype-pt-sans/package.nix b/pkgs/by-name/pa/paratype-pt-sans/package.nix index 000ac93e602b..f9743d5a107e 100644 --- a/pkgs/by-name/pa/paratype-pt-sans/package.nix +++ b/pkgs/by-name/pa/paratype-pt-sans/package.nix @@ -2,6 +2,7 @@ lib, stdenvNoCC, fetchFromGitHub, + installFonts, }: stdenvNoCC.mkDerivation { @@ -16,13 +17,7 @@ stdenvNoCC.mkDerivation { rootDir = "ofl/ptsans"; }; - installPhase = '' - runHook preInstall - - install -Dm644 *.ttf -t $out/share/fonts/truetype - - runHook postInstall - ''; + nativeBuildInputs = [ installFonts ]; meta = { homepage = "https://www.paratype.ru/catalog/font/pt/pt-sans"; diff --git a/pkgs/by-name/pa/paratype-pt-serif/package.nix b/pkgs/by-name/pa/paratype-pt-serif/package.nix index f84c4f0df42b..122d4cb21b57 100644 --- a/pkgs/by-name/pa/paratype-pt-serif/package.nix +++ b/pkgs/by-name/pa/paratype-pt-serif/package.nix @@ -2,6 +2,7 @@ lib, stdenvNoCC, fetchFromGitHub, + installFonts, }: stdenvNoCC.mkDerivation { @@ -16,13 +17,7 @@ stdenvNoCC.mkDerivation { rootDir = "ofl/ptserif"; }; - installPhase = '' - runHook preInstall - - install -Dm644 *.ttf -t $out/share/fonts/truetype - - runHook postInstall - ''; + nativeBuildInputs = [ installFonts ]; meta = { homepage = "https://www.paratype.ru/catalog/font/pt/pt-serif";