pyrox.dev
lol
freetype default: Don't use stdenv.cross
authored by
hsloan
and committed by
John Ericson
cebe4ee5
9b2d1cbc
+7
-7
pkgs/development/libraries/freetype/default.nix
+7
-7
pkgs/development/libraries/freetype/default.nix
···
1
-
{
2
-
stdenv, lib, fetchurl, copyPathsToStore,
3
-
pkgconfig, which,
4
-
zlib, bzip2, libpng, gnumake, glib,
5
6
-
# FreeType supports LCD filtering (colloquially referred to as sub-pixel rendering).
7
# LCD filtering is also known as ClearType and covered by several Microsoft patents.
8
# This option allows it to be disabled. See http://www.freetype.org/patents.html.
9
-
useEncumberedCode ? true,
10
}:
11
12
let
···
67
68
postInstall = glib.flattenInclude;
69
70
-
crossAttrs = stdenv.lib.optionalAttrs (stdenv.cross.libc or null != "msvcrt") {
71
# Somehow it calls the unwrapped gcc, "i686-pc-linux-gnu-gcc", instead
72
# of gcc. I think it's due to the unwrapped gcc being in the PATH. I don't
73
# know why it's on the PATH.
···
1
+
{ stdenv, lib, fetchurl, copyPathsToStore
2
+
, hostPlatform
3
+
, pkgconfig, which
4
+
, zlib, bzip2, libpng, gnumake, glib
5
6
+
, # FreeType supports LCD filtering (colloquially referred to as sub-pixel rendering).
7
# LCD filtering is also known as ClearType and covered by several Microsoft patents.
8
# This option allows it to be disabled. See http://www.freetype.org/patents.html.
9
+
useEncumberedCode ? true
10
}:
11
12
let
···
67
68
postInstall = glib.flattenInclude;
69
70
+
crossAttrs = stdenv.lib.optionalAttrs (hostPlatform.libc or null != "msvcrt") {
71
# Somehow it calls the unwrapped gcc, "i686-pc-linux-gnu-gcc", instead
72
# of gcc. I think it's due to the unwrapped gcc being in the PATH. I don't
73
# know why it's on the PATH.