diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-10 12:32:09 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-10 13:14:13 -0400 |
| commit | 88ff3c0f5d5381351daeb38099efb303f970c810 (patch) | |
| tree | bc79bd574df7dd71e40424651a3a2fe0cbde0b04 /pkgs/development/libraries/freetype | |
| parent | 219b74d71bdd8c93d099cc921cc4f192bd8753ad (diff) | |
| download | nixpkgs-88ff3c0f5d5381351daeb38099efb303f970c810.tar nixpkgs-88ff3c0f5d5381351daeb38099efb303f970c810.tar.gz nixpkgs-88ff3c0f5d5381351daeb38099efb303f970c810.tar.bz2 nixpkgs-88ff3c0f5d5381351daeb38099efb303f970c810.tar.lz nixpkgs-88ff3c0f5d5381351daeb38099efb303f970c810.tar.xz nixpkgs-88ff3c0f5d5381351daeb38099efb303f970c810.tar.zst nixpkgs-88ff3c0f5d5381351daeb38099efb303f970c810.zip | |
freetype: Remove crossAttrs
These sorts of C compiler confusions aren't really a problem anymore. Everything is on the path with the right environment variables.
Diffstat (limited to 'pkgs/development/libraries/freetype')
| -rw-r--r-- | pkgs/development/libraries/freetype/default.nix | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix index 4d2455d4872..23aa86af377 100644 --- a/pkgs/development/libraries/freetype/default.nix +++ b/pkgs/development/libraries/freetype/default.nix @@ -62,11 +62,4 @@ in stdenv.mkDerivation rec { wrapProgram "$dev/bin/freetype-config" \ --set PKG_CONFIG_PATH "$PKG_CONFIG_PATH:$dev/lib/pkgconfig" ''; - - 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. - configureFlags = "--disable-static CC_BUILD=gcc"; - }; } |