diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-07-09 22:02:19 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-07-09 22:03:31 +0200 |
| commit | 73ad32e1d94f5c774e4f5e685a7efba51a997c78 (patch) | |
| tree | 3c12addd37ae73564a4acbf3ee86318bc0385a18 /pkgs/development/libraries/freetype | |
| parent | 4b263946dd77aed9ec118aafc85fbd678397afe2 (diff) | |
| download | nixpkgs-73ad32e1d94f5c774e4f5e685a7efba51a997c78.tar nixpkgs-73ad32e1d94f5c774e4f5e685a7efba51a997c78.tar.gz nixpkgs-73ad32e1d94f5c774e4f5e685a7efba51a997c78.tar.bz2 nixpkgs-73ad32e1d94f5c774e4f5e685a7efba51a997c78.tar.lz nixpkgs-73ad32e1d94f5c774e4f5e685a7efba51a997c78.tar.xz nixpkgs-73ad32e1d94f5c774e4f5e685a7efba51a997c78.tar.zst nixpkgs-73ad32e1d94f5c774e4f5e685a7efba51a997c78.zip | |
freetype: flatten include to fix several builds
I just wonder why freetype-2.5 needed to move headers around.
Diffstat (limited to 'pkgs/development/libraries/freetype')
| -rw-r--r-- | pkgs/development/libraries/freetype/default.nix | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix index 510e816f88c..a13e399ab0f 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 |