diff options
author | hsloan <ishaqsloan@gmail.com> | 2017-06-28 16:10:03 -0400 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-06-28 19:32:41 -0400 |
commit | cebe4ee5c99d50eaff7d0ffb280a17ff8d471c81 (patch) | |
tree | 1368a91870eaa4a3ebe4da10848ac308a0b0552d | |
parent | 9b2d1cbc7042056dd475f4c5aa41b04c992b9495 (diff) | |
download | nixlib-cebe4ee5c99d50eaff7d0ffb280a17ff8d471c81.tar nixlib-cebe4ee5c99d50eaff7d0ffb280a17ff8d471c81.tar.gz nixlib-cebe4ee5c99d50eaff7d0ffb280a17ff8d471c81.tar.bz2 nixlib-cebe4ee5c99d50eaff7d0ffb280a17ff8d471c81.tar.lz nixlib-cebe4ee5c99d50eaff7d0ffb280a17ff8d471c81.tar.xz nixlib-cebe4ee5c99d50eaff7d0ffb280a17ff8d471c81.tar.zst nixlib-cebe4ee5c99d50eaff7d0ffb280a17ff8d471c81.zip |
freetype default: Don't use stdenv.cross
-rw-r--r-- | pkgs/development/libraries/freetype/default.nix | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix index 9b2c6fe11e15..8f16f85cabf7 100644 --- a/pkgs/development/libraries/freetype/default.nix +++ b/pkgs/development/libraries/freetype/default.nix @@ -1,12 +1,12 @@ -{ - stdenv, lib, fetchurl, copyPathsToStore, - pkgconfig, which, - zlib, bzip2, libpng, gnumake, glib, +{ stdenv, lib, fetchurl, copyPathsToStore +, hostPlatform +, pkgconfig, which +, zlib, bzip2, libpng, gnumake, glib - # FreeType supports LCD filtering (colloquially referred to as sub-pixel rendering). +, # FreeType supports LCD filtering (colloquially referred to as sub-pixel rendering). # LCD filtering is also known as ClearType and covered by several Microsoft patents. # This option allows it to be disabled. See http://www.freetype.org/patents.html. - useEncumberedCode ? true, + useEncumberedCode ? true }: let @@ -67,7 +67,7 @@ in stdenv.mkDerivation { postInstall = glib.flattenInclude; - crossAttrs = stdenv.lib.optionalAttrs (stdenv.cross.libc or null != "msvcrt") { + crossAttrs = stdenv.lib.optionalAttrs (hostPlatform.libc or null != "msvcrt") { # Somehow it calls the unwrapped gcc, "i686-pc-linux-gnu-gcc", instead # of gcc. I think it's due to the unwrapped gcc being in the PATH. I don't # know why it's on the PATH. |