From 88ff3c0f5d5381351daeb38099efb303f970c810 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Thu, 10 May 2018 12:32:09 -0400 Subject: 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. --- pkgs/development/libraries/freetype/default.nix | 7 ------- 1 file changed, 7 deletions(-) (limited to 'pkgs/development/libraries/freetype') 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"; - }; } -- cgit 1.4.1