mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-16 23:03:40 +01:00
Fixing the fontconfig native build (cross-building related)
svn path=/nixpkgs/branches/stdenv-updates/; revision=18658
This commit is contained in:
parent
cfbe19781d
commit
8a115c13ad
1 changed files with 4 additions and 1 deletions
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue