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

fontconfig default: Don't use stdenv.cross

Browse Source
This commit is contained in:
hsloan 2017-06-28 16:09:01 -04:00 committed by John Ericson
parent 0fa3d99f4e
commit 9b2d1cbc70
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/libraries/fontconfig/default.nix
View File

@ -1,5 +1,7 @@
{ stdenv, fetchurl, fetchpatch, pkgconfig, freetype, expat, libxslt, dejavu_fonts { stdenv, substituteAll, fetchurl, fetchpatch
, substituteAll }: , pkgconfig, freetype, expat, libxslt, dejavu_fonts
, hostPlatform
}:
/** Font configuration scheme /** Font configuration scheme
- ./config-compat.patch makes fontconfig try the following root configs, in order: - ./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. # We should find a better way to access the arch reliably.
crossArch = stdenv.cross.arch or null; crossArch = hostPlatform.arch or null;
preConfigure = '' preConfigure = ''
if test -n "$crossConfig"; then if test -n "$crossConfig"; then