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

freetype: flatten include to fix several builds 

I just wonder why freetype-2.5 needed to move headers around.
This commit is contained in:
Vladimír Čunát 2014-07-09 22:02:19 +02:00
parent 4b263946dd
commit 73ad32e1d9
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,6 +2,7 @@
# FreeType supports sub-pixel rendering. This is patented by # FreeType supports sub-pixel rendering. This is patented by
# Microsoft, so it is disabled by default. This option allows it to # Microsoft, so it is disabled by default. This option allows it to
# be enabled. See http://www.freetype.org/patents.html. # be enabled. See http://www.freetype.org/patents.html.
, glib/*passthru only*/
, useEncumberedCode ? true , useEncumberedCode ? true
}: }:
@ -46,7 +47,10 @@ stdenv.mkDerivation rec {
doCheck = true; doCheck = true;
postInstall = ''ln -s freetype2 "$out"/include/freetype''; # compat hack # compat hacks
postInstall = glib.flattenInclude + ''
ln -s . "$out"/include/freetype
'';
crossAttrs = { crossAttrs = {
# Somehow it calls the unwrapped gcc, "i686-pc-linux-gnu-gcc", instead # Somehow it calls the unwrapped gcc, "i686-pc-linux-gnu-gcc", instead