diff options
| author | Piotr Bogdan <ppbogdan@gmail.com> | 2018-03-22 21:36:07 +0000 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2018-03-23 02:09:32 +0300 |
| commit | 077dedbf241a3a644cc3d28ff2f7befdb2b0d200 (patch) | |
| tree | 66c4dce52248c23c25a5a67333e29210f5729e47 /pkgs/development/libraries/freetype | |
| parent | 91072b7b23eae18c7be986d44f47c6e3dfe4ce92 (diff) | |
| download | nixpkgs-077dedbf241a3a644cc3d28ff2f7befdb2b0d200.tar nixpkgs-077dedbf241a3a644cc3d28ff2f7befdb2b0d200.tar.gz nixpkgs-077dedbf241a3a644cc3d28ff2f7befdb2b0d200.tar.bz2 nixpkgs-077dedbf241a3a644cc3d28ff2f7befdb2b0d200.tar.lz nixpkgs-077dedbf241a3a644cc3d28ff2f7befdb2b0d200.tar.xz nixpkgs-077dedbf241a3a644cc3d28ff2f7befdb2b0d200.tar.zst nixpkgs-077dedbf241a3a644cc3d28ff2f7befdb2b0d200.zip | |
freetype: fix freetype-config
Diffstat (limited to 'pkgs/development/libraries/freetype')
| -rw-r--r-- | pkgs/development/libraries/freetype/default.nix | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix index cd7ac64da15..3fccce02def 100644 --- a/pkgs/development/libraries/freetype/default.nix +++ b/pkgs/development/libraries/freetype/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, copyPathsToStore , hostPlatform -, pkgconfig, which +, pkgconfig, which, makeWrapper , zlib, bzip2, libpng, gnumake, glib , # FreeType supports LCD filtering (colloquially referred to as sub-pixel rendering). @@ -38,7 +38,7 @@ in stdenv.mkDerivation rec { propagatedBuildInputs = [ zlib bzip2 libpng ]; # needed when linking against freetype # dependence on harfbuzz is looser than the reverse dependence - nativeBuildInputs = [ pkgconfig which ] + nativeBuildInputs = [ pkgconfig which makeWrapper ] # FreeType requires GNU Make, which is not part of stdenv on FreeBSD. ++ optional (!stdenv.isLinux) gnumake; @@ -58,7 +58,10 @@ in stdenv.mkDerivation rec { doCheck = true; - postInstall = glib.flattenInclude; + postInstall = glib.flattenInclude + '' + 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 |