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

freetype: Remove crossAttrs

Browse Source 
These sorts of C compiler confusions aren't really a problem anymore.
Everything is on the path with the right environment variables.
This commit is contained in:
John Ericson 2018-05-10 12:32:09 -04:00
parent 219b74d71b
commit 88ff3c0f5d
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -62,11 +62,4 @@ in stdenv.mkDerivation rec {
wrapProgram "$dev/bin/freetype-config" \ wrapProgram "$dev/bin/freetype-config" \
--set PKG_CONFIG_PATH "$PKG_CONFIG_PATH:$dev/lib/pkgconfig" --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";
};
} }