fontconfig default: Don't use stdenv.cross

2017-06-28 16:09:01 -04:00 · 2017-06-28 16:09:01 -04:00 · 9b2d1cbc70
commit 9b2d1cbc70
parent 0fa3d99f4e
1 changed files with 5 additions and 3 deletions
--- 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