diff options
| author | hsloan <ishaqsloan@gmail.com> | 2017-06-28 16:09:01 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-06-28 19:31:16 -0400 |
| commit | 9b2d1cbc7042056dd475f4c5aa41b04c992b9495 (patch) | |
| tree | f0c7709cbac3d30a37a3da72cadd20c204ca433a /pkgs/development/libraries/fontconfig | |
| parent | 0fa3d99f4ee17dc9a639b9535aaa2df8f242f453 (diff) | |
| download | nixpkgs-9b2d1cbc7042056dd475f4c5aa41b04c992b9495.tar nixpkgs-9b2d1cbc7042056dd475f4c5aa41b04c992b9495.tar.gz nixpkgs-9b2d1cbc7042056dd475f4c5aa41b04c992b9495.tar.bz2 nixpkgs-9b2d1cbc7042056dd475f4c5aa41b04c992b9495.tar.lz nixpkgs-9b2d1cbc7042056dd475f4c5aa41b04c992b9495.tar.xz nixpkgs-9b2d1cbc7042056dd475f4c5aa41b04c992b9495.tar.zst nixpkgs-9b2d1cbc7042056dd475f4c5aa41b04c992b9495.zip | |
fontconfig default: Don't use stdenv.cross
Diffstat (limited to 'pkgs/development/libraries/fontconfig')
| -rw-r--r-- | pkgs/development/libraries/fontconfig/default.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix index 14983b744df..f176aa0878c 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 |