Unverified Commit 8f655393 authored by 7c6f434c's avatar 7c6f434c Committed by GitHub
Browse files

various: use installFonts hook (#495675)

parents edd93c2f 11698393
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
@@ -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
  '';

+4 −4
Original line number Diff line number Diff line
@@ -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
  '';

+3 −5
Original line number Diff line number Diff line
@@ -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/";
+2 −5
Original line number Diff line number Diff line
@@ -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";
+2 −5
Original line number Diff line number Diff line
@@ -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";
Loading