From 73ad32e1d94f5c774e4f5e685a7efba51a997c78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 9 Jul 2014 22:02:19 +0200 Subject: [PATCH] freetype: flatten include to fix several builds I just wonder why freetype-2.5 needed to move headers around. --- pkgs/development/libraries/freetype/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix index 510e816f88c9..a13e399ab0fe 100644 --- a/pkgs/development/libraries/freetype/default.nix +++ b/pkgs/development/libraries/freetype/default.nix @@ -2,6 +2,7 @@ # FreeType supports sub-pixel rendering. This is patented by # Microsoft, so it is disabled by default. This option allows it to # be enabled. See http://www.freetype.org/patents.html. +, glib/*passthru only*/ , useEncumberedCode ? true }: @@ -46,7 +47,10 @@ stdenv.mkDerivation rec { doCheck = true; - postInstall = ''ln -s freetype2 "$out"/include/freetype''; # compat hack + # compat hacks + postInstall = glib.flattenInclude + '' + ln -s . "$out"/include/freetype + ''; crossAttrs = { # Somehow it calls the unwrapped gcc, "i686-pc-linux-gnu-gcc", instead