diff --git a/pkgs/by-name/am/amiri/package.nix b/pkgs/by-name/am/amiri/package.nix index d6dccaa14eee..2e42acdacdaa 100644 --- a/pkgs/by-name/am/amiri/package.nix +++ b/pkgs/by-name/am/amiri/package.nix @@ -2,6 +2,7 @@ lib, stdenvNoCC, fetchzip, + installFonts, }: stdenvNoCC.mkDerivation (finalAttrs: { @@ -13,13 +14,18 @@ stdenvNoCC.mkDerivation (finalAttrs: { hash = "sha256-BsYPMBlRdzlkvyleZIxGDuGjmqhDlEJ4udj8zoKUSzA="; }; + outputs = [ + "out" + "doc" + ]; + + nativeBuildInputs = [ installFonts ]; + installPhase = '' runHook preInstall - mkdir -p $out/share/fonts/truetype - mv *.ttf $out/share/fonts/truetype/ - mkdir -p $out/share/doc/amiri-${finalAttrs.version} - mv {*.html,*.txt,*.md} $out/share/doc/amiri-${finalAttrs.version}/ + mkdir -p $doc/share/doc/amiri-${finalAttrs.version} + mv {*.html,*.txt,*.md} $doc/share/doc/amiri-${finalAttrs.version}/ runHook postInstall ''; diff --git a/pkgs/by-name/he/helvetica-neue-lt-std/package.nix b/pkgs/by-name/he/helvetica-neue-lt-std/package.nix index 8a8d8a083523..c1b6fb5684b2 100644 --- a/pkgs/by-name/he/helvetica-neue-lt-std/package.nix +++ b/pkgs/by-name/he/helvetica-neue-lt-std/package.nix @@ -2,6 +2,7 @@ lib, stdenvNoCC, fetchzip, + installFonts, }: stdenvNoCC.mkDerivation { @@ -14,12 +15,11 @@ stdenvNoCC.mkDerivation { hash = "sha256-ytoTTrnwN1lMw/gTxS4DRAq+tV5WzB2xHP4vVxLZ1ZI="; }; - installPhase = '' - runHook preInstall + nativeBuildInputs = [ installFonts ]; - install -Dm644 'Helvetica Neue LT Std'/*.otf -t $out/share/fonts/opentype - - runHook postInstall + # AppleDouble metadata files named ._*.otf would be installed as fonts + preInstall = '' + rm -r __MACOSX ''; meta = { diff --git a/pkgs/by-name/kh/khmeros/package.nix b/pkgs/by-name/kh/khmeros/package.nix index 07ba50b5680d..4a78cf57649a 100644 --- a/pkgs/by-name/kh/khmeros/package.nix +++ b/pkgs/by-name/kh/khmeros/package.nix @@ -2,6 +2,7 @@ lib, stdenvNoCC, fetchurl, + installFonts, }: stdenvNoCC.mkDerivation rec { @@ -13,14 +14,7 @@ stdenvNoCC.mkDerivation rec { hash = "sha256-gBcM9YHSuhbxvwfQTvywH/5kN921GOyvGtkROcmcBiw="; }; - installPhase = '' - runHook preInstall - - mkdir -p $out/share/fonts - cp *.ttf $out/share/fonts - - runHook postInstall - ''; + nativeBuildInputs = [ installFonts ]; meta = { description = "Unicode fonts for the Khmer language"; diff --git a/pkgs/by-name/le/league-gothic/package.nix b/pkgs/by-name/le/league-gothic/package.nix index ca72373b1b80..68fc958499ef 100644 --- a/pkgs/by-name/le/league-gothic/package.nix +++ b/pkgs/by-name/le/league-gothic/package.nix @@ -2,6 +2,7 @@ lib, fetchzip, stdenvNoCC, + installFonts, }: stdenvNoCC.mkDerivation (finalAttrs: { @@ -13,14 +14,9 @@ stdenvNoCC.mkDerivation (finalAttrs: { hash = "sha256-emkXKyQw4R0Zgg02oJsvBkqV0jmczP0tF0K2IKqJHMA="; }; - installPhase = '' - runHook preInstall + nativeBuildInputs = [ installFonts ]; - 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 - ''; + dontInstallWebfonts = true; meta = { description = "Revival of an old classic, Alternate Gothic #1"; diff --git a/pkgs/by-name/le/league-spartan/package.nix b/pkgs/by-name/le/league-spartan/package.nix index 35704c997a40..f534a66646a6 100644 --- a/pkgs/by-name/le/league-spartan/package.nix +++ b/pkgs/by-name/le/league-spartan/package.nix @@ -2,6 +2,7 @@ lib, fetchzip, stdenvNoCC, + installFonts, }: stdenvNoCC.mkDerivation (finalAttrs: { @@ -13,13 +14,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { hash = "sha256-dkvWRYli8vk+E0DkZ2NWCJKfSfdo4jEcGo0puQpFVVc="; }; - installPhase = '' - runHook preInstall + nativeBuildInputs = [ installFonts ]; - install -D -m444 -t $out/share/fonts/truetype $src/static/TTF/*.ttf - install -D -m444 -t $out/share/fonts/opentype $src/static/OTF/*.otf + dontInstallWebfonts = true; - runHook postInstall + preInstall = '' + rm -r variable ''; meta = { diff --git a/pkgs/by-name/li/liberastika/package.nix b/pkgs/by-name/li/liberastika/package.nix index b8f77be79b15..e4a0cddbeab5 100644 --- a/pkgs/by-name/li/liberastika/package.nix +++ b/pkgs/by-name/li/liberastika/package.nix @@ -2,6 +2,7 @@ lib, stdenvNoCC, fetchzip, + installFonts, }: stdenvNoCC.mkDerivation rec { @@ -14,13 +15,7 @@ stdenvNoCC.mkDerivation rec { hash = "sha256-woUpOmxhj6eEw7PKJ8EyRcs3ORj0gCZhxHP5a5dy5z0="; }; - installPhase = '' - runHook preInstall - - install -Dm644 *.ttf -t $out/share/fonts/truetype - - runHook postInstall - ''; + nativeBuildInputs = [ installFonts ]; meta = { description = "Liberation Sans fork with improved cyrillic support"; diff --git a/pkgs/by-name/li/liberation-sans-narrow/package.nix b/pkgs/by-name/li/liberation-sans-narrow/package.nix index df0a8e8f080c..cf0272ffe0c0 100644 --- a/pkgs/by-name/li/liberation-sans-narrow/package.nix +++ b/pkgs/by-name/li/liberation-sans-narrow/package.nix @@ -4,6 +4,7 @@ fetchFromGitHub, fontforge, python3, + installFonts, }: stdenv.mkDerivation rec { @@ -19,12 +20,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ fontforge + installFonts python3 ]; installPhase = '' runHook preInstall - find . -name '*Narrow*.ttf' -exec install -m444 -Dt $out/share/fonts/truetype {} \; install -m444 -Dt $out/doc/${pname}-${version} AUTHORS ChangeLog COPYING License.txt README.rst runHook postInstall ''; diff --git a/pkgs/by-name/li/libre-franklin/package.nix b/pkgs/by-name/li/libre-franklin/package.nix index 876d8e67b36a..48820b374746 100644 --- a/pkgs/by-name/li/libre-franklin/package.nix +++ b/pkgs/by-name/li/libre-franklin/package.nix @@ -2,6 +2,7 @@ lib, stdenvNoCC, fetchFromGitHub, + installFonts, }: stdenvNoCC.mkDerivation rec { @@ -15,11 +16,22 @@ stdenvNoCC.mkDerivation rec { hash = "sha256-GR1KHiQ1lTOmU8eAPR2pxUlMpWiW2EDMG78VDjELxDU="; }; + outputs = [ + "out" + "doc" + ]; + + nativeBuildInputs = [ installFonts ]; + + # Same fonts as fonts/OTF, so install only the OTF versions + preInstall = '' + rm -r fonts/TTF + ''; + installPhase = '' runHook preInstall - install -m444 -Dt $out/share/fonts/opentype */OTF/*.otf - install -m444 -Dt $out/share/doc/${pname}-${version} README.md FONTLOG.txt + install -m444 -Dt $doc/share/doc/${pname}-${version} README.md FONTLOG.txt runHook postInstall ''; diff --git a/pkgs/by-name/li/linja-pi-pu-lukin/package.nix b/pkgs/by-name/li/linja-pi-pu-lukin/package.nix index 98d0ff97a165..b4b94e2253eb 100644 --- a/pkgs/by-name/li/linja-pi-pu-lukin/package.nix +++ b/pkgs/by-name/li/linja-pi-pu-lukin/package.nix @@ -2,11 +2,12 @@ lib, stdenvNoCC, fetchurl, + installFonts, }: stdenvNoCC.mkDerivation { pname = "linja-pi-pu-lukin"; - version = "unstable-2021-10-29"; + version = "0-unstable-2021-10-29"; src = fetchurl { url = "https://web.archive.org/web/20211029000000/https://jansa-tp.github.io/linja-pi-pu-lukin/PuLukin.otf"; @@ -15,12 +16,10 @@ stdenvNoCC.mkDerivation { dontUnpack = true; - installPhase = '' - runHook preInstall + nativeBuildInputs = [ installFonts ]; - install -D $src $out/share/fonts/opentype/linja-pi-pu-lukin.otf - - runHook postInstall + preInstall = '' + cp $src linja-pi-pu-lukin.otf ''; meta = { diff --git a/pkgs/by-name/ph/phira-free/package.nix b/pkgs/by-name/ph/phira-free/package.nix index 3cc205396a2e..f0fa9687cbcd 100644 --- a/pkgs/by-name/ph/phira-free/package.nix +++ b/pkgs/by-name/ph/phira-free/package.nix @@ -24,7 +24,7 @@ phira.override { chmod -R +w $out/assets magick -size 4000x2000 canvas:'rgb(128,162,206)' $out/assets/background.jpg - cp ${ubuntu-classic}/share/fonts/truetype/ubuntu/Ubuntu-R.ttf $out/assets/font.ttf + cp ${ubuntu-classic}/share/fonts/truetype/Ubuntu-R.ttf $out/assets/font.ttf runHook postInstall ''; diff --git a/pkgs/by-name/sh/shabnam-fonts/package.nix b/pkgs/by-name/sh/shabnam-fonts/package.nix index 2e85acf12fbe..2f6ac36a6c34 100644 --- a/pkgs/by-name/sh/shabnam-fonts/package.nix +++ b/pkgs/by-name/sh/shabnam-fonts/package.nix @@ -2,6 +2,7 @@ lib, stdenvNoCC, fetchFromGitHub, + installFonts, }: stdenvNoCC.mkDerivation rec { @@ -15,13 +16,9 @@ stdenvNoCC.mkDerivation rec { hash = "sha256-H03GTKRVPiwU4edkr4x5upW4JCy6320Lo+cKK9FRMQs="; }; - installPhase = '' - runHook preInstall + nativeBuildInputs = [ installFonts ]; - find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/shabnam-fonts {} \; - - runHook postInstall - ''; + dontInstallWebfonts = true; meta = { homepage = "https://github.com/rastikerdar/shabnam-font"; diff --git a/pkgs/by-name/ub/ubuntu-classic/package.nix b/pkgs/by-name/ub/ubuntu-classic/package.nix index 7752660ac3b7..4dda1ad60215 100644 --- a/pkgs/by-name/ub/ubuntu-classic/package.nix +++ b/pkgs/by-name/ub/ubuntu-classic/package.nix @@ -3,6 +3,7 @@ stdenvNoCC, fetchgit, gitUpdater, + installFonts, }: stdenvNoCC.mkDerivation (finalAttrs: { @@ -15,12 +16,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { hash = "sha256-GrpBVgisVu7NklFYqkEqYi0hui/pCHlsM3Ky4mEUq90="; }; - installPhase = '' - runHook preInstall + nativeBuildInputs = [ installFonts ]; - install -m444 -Dt $out/share/fonts/truetype/ubuntu *.ttf - - runHook postInstall + # Hinting sources such as sources/VTT/Ubuntu-B-hinting.ttf are not fonts to install + preInstall = '' + rm -r sources ''; passthru.updateScript = gitUpdater { rev-prefix = "import/"; };