diff options
author | Jörg Thalheim <joerg@thalheim.io> | 2018-12-07 11:58:09 +0000 |
---|---|---|
committer | Jörg Thalheim <joerg@thalheim.io> | 2018-12-07 11:59:38 +0000 |
commit | 4f87d7e733ae001ed45329b1cda569117f81c9e6 (patch) | |
tree | 94865eebb67307b9b0111c9981a65f4ce6e172f0 /pkgs/development/libraries/fontconfig | |
parent | 12f4e081cba2bdbd03748b264e3f4df99135875f (diff) |
Revert "fontconfig: fix cross make-fonts-cache & make-fonts-config"
This reverts commit 508cbf4d25aeead1442a4c3ef1ee1336cc703645. This make the function ignore the fontconfig variable
Diffstat (limited to 'pkgs/development/libraries/fontconfig')
-rw-r--r-- | pkgs/development/libraries/fontconfig/make-fonts-cache.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/fontconfig/make-fonts-conf.nix | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/libraries/fontconfig/make-fonts-cache.nix b/pkgs/development/libraries/fontconfig/make-fonts-cache.nix index dcef4a4b205f8..1c88235b92573 100644 --- a/pkgs/development/libraries/fontconfig/make-fonts-cache.nix +++ b/pkgs/development/libraries/fontconfig/make-fonts-cache.nix @@ -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 = '' diff --git a/pkgs/development/libraries/fontconfig/make-fonts-conf.nix b/pkgs/development/libraries/fontconfig/make-fonts-conf.nix index 4d353f5d7e262..3cd4a894b37ff 100644 --- a/pkgs/development/libraries/fontconfig/make-fonts-conf.nix +++ b/pkgs/development/libraries/fontconfig/make-fonts-conf.nix @@ -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 ]; } |