cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #51601 from eburimu/fix/cross-make-fonts-cache-and-conf

Browse source 
fontconfig: fix cross make-fonts-cache & make-fonts-config
This commit is contained in:
Jörg Thalheim 2018-12-07 11:55:12 +00:00 committed by GitHub
commit 12f4e081cb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/libraries/fontconfig/make-fonts-cache.nix
View file

@ -1,8 +1,8 @@
{ runCommand, lib, fontconfig, fontDirectories }: { runCommand, lib, fontconfig, fontDirectories, buildPackages }:
runCommand "fc-cache" runCommand "fc-cache"
rec { rec {
buildInputs = [ fontconfig.bin ]; nativeBuildInputs = [ buildPackages.fontconfig.bin ];
preferLocalBuild = true; preferLocalBuild = true;
passAsFile = [ "fontDirs" ]; passAsFile = [ "fontDirs" ];
fontDirs = '' fontDirs = ''

2
pkgs/development/libraries/fontconfig/make-fonts-conf.nix
View file

@ -2,7 +2,7 @@
runCommand "fonts.conf" runCommand "fonts.conf"
{ {
buildInputs = [ libxslt fontconfig ]; nativeBuildInputs = [ libxslt fontconfig ];
# Add a default font for non-nixos systems, <1MB and in nixos defaults. # Add a default font for non-nixos systems, <1MB and in nixos defaults.
fontDirectories = fontDirectories ++ [ dejavu_fonts.minimal ]; fontDirectories = fontDirectories ++ [ dejavu_fonts.minimal ];
} }