diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-10 00:57:52 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-10 01:37:31 -0400 |
| commit | a02be2bd85b37ed8b257e969d9439357844baa24 (patch) | |
| tree | 5dd1c59168e51b84ced74122fe9d7e14f3e7a2d3 /pkgs/development/libraries/fontconfig | |
| parent | a31984ecdaf7b011163c3c71679eb285d951d735 (diff) | |
| download | nixpkgs-a02be2bd85b37ed8b257e969d9439357844baa24.tar nixpkgs-a02be2bd85b37ed8b257e969d9439357844baa24.tar.gz nixpkgs-a02be2bd85b37ed8b257e969d9439357844baa24.tar.bz2 nixpkgs-a02be2bd85b37ed8b257e969d9439357844baa24.tar.lz nixpkgs-a02be2bd85b37ed8b257e969d9439357844baa24.tar.xz nixpkgs-a02be2bd85b37ed8b257e969d9439357844baa24.tar.zst nixpkgs-a02be2bd85b37ed8b257e969d9439357844baa24.zip | |
treewide: Get rid of `*Platform.arch`
Use `parsed.cpu.name` or `platform.gcc.arch` instead.
Diffstat (limited to 'pkgs/development/libraries/fontconfig')
| -rw-r--r-- | pkgs/development/libraries/fontconfig/2.10.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/fontconfig/default.nix | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/development/libraries/fontconfig/2.10.nix b/pkgs/development/libraries/fontconfig/2.10.nix index 3f3c04b15a3..5fb0ea4429e 100644 --- a/pkgs/development/libraries/fontconfig/2.10.nix +++ b/pkgs/development/libraries/fontconfig/2.10.nix @@ -24,7 +24,9 @@ stdenv.mkDerivation rec { ]; # We should find a better way to access the arch reliably. - crossArch = hostPlatform.arch or null; + crossArch = if stdenv.hostPlatform != stdenv.buildPlatform + then hostPlatform.parsed.cpu.name + else null; preConfigure = '' if test -n "$crossConfig"; then diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix index 9c4116c8f0b..ce41f1ac7eb 100644 --- a/pkgs/development/libraries/fontconfig/default.nix +++ b/pkgs/development/libraries/fontconfig/default.nix @@ -56,7 +56,9 @@ stdenv.mkDerivation rec { ]; # We should find a better way to access the arch reliably. - crossArch = hostPlatform.arch or null; + crossArch = if stdenv.hostPlatform != stdenv.buildPlatform + then hostPlatform.parsed.cpu.name + else null; preConfigure = '' if test -n "$crossConfig"; then |