public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "fontconfig: fix cross make-fonts-cache & make-fonts-config"

Browse Source 
This reverts commit 508cbf4d25aeead1442a4c3ef1ee1336cc703645.

This make the function ignore the fontconfig variable
This commit is contained in:
Jörg Thalheim 2018-12-07 11:58:09 +00:00
parent 12f4e081cb
commit 4f87d7e733
No known key found for this signature in database
GPG Key ID: CA4106B8D7CC79FA
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, buildPackages }:
{ runCommand, lib, fontconfig, fontDirectories }:
runCommand "fc-cache"
rec {
nativeBuildInputs = [ buildPackages.fontconfig.bin ];
buildInputs = [ fontconfig.bin ];
preferLocalBuild = true;
passAsFile = [ "fontDirs" ];
fontDirs = ''

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

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