From 8a115c13ad63cb36042b5456ad83aae34b017436 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 26 Nov 2009 21:26:42 +0000 Subject: [PATCH] Fixing the fontconfig native build (cross-building related) svn path=/nixpkgs/branches/stdenv-updates/; revision=18658 --- pkgs/development/libraries/fontconfig/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix index aa3ab19bf33..7e802eb86b8 100644 --- a/pkgs/development/libraries/fontconfig/default.nix +++ b/pkgs/development/libraries/fontconfig/default.nix @@ -13,7 +13,10 @@ stdenv.mkDerivation rec { configureFlags = "--with-confdir=/etc/fonts --with-cache-dir=/var/cache/fontconfig --disable-docs --with-default-fonts="; - crossArch = stdenv.cross.arch; + # We should find a better way to access the arch reliably. + crossArch = if (stdenv ? cross && stdenv.cross != null) + then stdenv.cross.arch else null; + preConfigure = '' if test -n "$crossConfig"; then