From 4f87d7e733ae001ed45329b1cda569117f81c9e6 Mon Sep 17 00:00:00 2001
From: Jörg Thalheim <joerg@thalheim.io>
Date: Fri, 7 Dec 2018 11:58:09 +0000
Subject: Revert "fontconfig: fix cross make-fonts-cache & make-fonts-config"

This reverts commit 508cbf4d25aeead1442a4c3ef1ee1336cc703645.

This make the function ignore the fontconfig variable
---
 pkgs/development/libraries/fontconfig/make-fonts-cache.nix | 4 ++--
 pkgs/development/libraries/fontconfig/make-fonts-conf.nix  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'pkgs/development/libraries/fontconfig')

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 ];
   }
-- 
cgit 1.4.1