From 9b2d1cbc7042056dd475f4c5aa41b04c992b9495 Mon Sep 17 00:00:00 2001
From: hsloan <ishaqsloan@gmail.com>
Date: Wed, 28 Jun 2017 16:09:01 -0400
Subject: [PATCH] fontconfig default: Don't use stdenv.cross
---
pkgs/development/libraries/fontconfig/default.nix | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix
index 14983b744df9..f176aa0878c8 100644
--- a/pkgs/development/libraries/fontconfig/default.nix
+++ b/pkgs/development/libraries/fontconfig/default.nix
@@ -1,5 +1,7 @@
-{ stdenv, fetchurl, fetchpatch, pkgconfig, freetype, expat, libxslt, dejavu_fonts
-, substituteAll }:
+{ stdenv, substituteAll, fetchurl, fetchpatch
+, pkgconfig, freetype, expat, libxslt, dejavu_fonts
+, hostPlatform
+}:
/** Font configuration scheme
- ./config-compat.patch makes fontconfig try the following root configs, in order:
@@ -53,7 +55,7 @@ stdenv.mkDerivation rec {
];
# We should find a better way to access the arch reliably.
- crossArch = stdenv.cross.arch or null;
+ crossArch = hostPlatform.arch or null;
preConfigure = ''
if test -n "$crossConfig"; then