Unverified Commit b64ec194 authored by K900's avatar K900 Committed by GitHub
Browse files

nixos/fonts: ship fontconfig caches even for cross-compiled hosts (#391305)

parents 0402be64 9435a2b4

nixos/modules/config/fonts/fontconfig.nix

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ let 
      <fontconfig>

        <!-- Font directories -->

        ${lib.concatStringsSep "\n" (map (font: "<dir>${font}</dir>") config.fonts.packages)}

        ${lib.optionalString (pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform) ''

        ${lib.optionalString (pkgs.stdenv.hostPlatform.emulatorAvailable pkgs.buildPackages) ''

          <!-- Pre-generated font caches -->

          <cachedir>${cache}</cachedir>

          ${lib.optionalString (pkgs.stdenv.hostPlatform.isx86_64 && cfg.cache32Bit) ''

pkgs/development/libraries/fontconfig/make-fonts-cache.nix

+14 −4
Original line number Diff line number Diff line 
{

  runCommand,

  lib,

  buildPackages,

  fontconfig,

  lib,

  runCommand,

  stdenv,

}:

let

  fontconfig' = fontconfig;

in

{

  fontconfig ? fontconfig',

  fontDirectories,

}:



runCommand "fc-cache"

  {

    nativeBuildInputs = [ fontconfig.bin ];

    preferLocalBuild = true;

    allowSubstitutes = false;

    passAsFile = [ "fontDirs" ];
@@ -29,8 +36,11 @@ runCommand "fc-cache" 
    cat "$fontDirsPath" >> fonts.conf

    echo "</fontconfig>" >> fonts.conf



    # N.B.: fc-cache keys its cache entries by architecture.

    # We must invoke the host `fc-cache` (not the build fontconfig) if we want

    # the cache to be usable by the host.

    mkdir -p $out

    fc-cache -sv

    ${stdenv.hostPlatform.emulator buildPackages} ${lib.getExe' fontconfig "fc-cache"} -sv



    # This is not a cache dir in the normal sense -- it won't be automatically

    # recreated.

pkgs/top-level/all-packages.nix

+1 −4
Original line number Diff line number Diff line
@@ -8742,10 +8742,7 @@ with pkgs; 














  makeFontsConf = callPackage ../development/libraries/fontconfig/make-fonts-conf.nix { };



























  makeFontsCache = let fontconfig_ = fontconfig; in {fontconfig ? fontconfig_, fontDirectories}:













    callPackage ../development/libraries/fontconfig/make-fonts-cache.nix {













      inherit fontconfig fontDirectories;













    };













  makeFontsCache = callPackage ../development/libraries/fontconfig/make-fonts-cache.nix { };





























  freenect = callPackage ../development/libraries/freenect {















    inherit (darwin.apple_sdk.frameworks) Cocoa GLUT;