JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

freetype default: Don't use stdenv.cross

Browse Source
This commit is contained in:
hsloan 2017-06-28 16:10:03 -04:00 committed by John Ericson
parent 9b2d1cbc70
commit cebe4ee5c9
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/development/libraries/freetype/default.nix
View File

@ -1,12 +1,12 @@
{ { stdenv, lib, fetchurl, copyPathsToStore
stdenv, lib, fetchurl, copyPathsToStore, , hostPlatform
pkgconfig, which, , pkgconfig, which
zlib, bzip2, libpng, gnumake, glib, , 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. # 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. # This option allows it to be disabled. See http://www.freetype.org/patents.html.
useEncumberedCode ? true, useEncumberedCode ? true
}: }:
let let
@ -67,7 +67,7 @@ in stdenv.mkDerivation {
postInstall = glib.flattenInclude; 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 # 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 # 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. # know why it's on the PATH.