alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

freetype: fix freetype-config

Browse source
This commit is contained in:
Piotr Bogdan 2018-03-22 21:36:07 +00:00 committed by Nikolay Amiantov
parent 91072b7b23
commit 077dedbf24
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkgs/development/libraries/freetype/default.nix
View file

@ -1,6 +1,6 @@
{ stdenv, lib, fetchurl, copyPathsToStore { stdenv, lib, fetchurl, copyPathsToStore
, hostPlatform , hostPlatform
, pkgconfig, which , pkgconfig, which, makeWrapper
, zlib, bzip2, libpng, gnumake, glib , zlib, bzip2, libpng, gnumake, glib
, # FreeType supports LCD filtering (colloquially referred to as sub-pixel rendering). , # 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 propagatedBuildInputs = [ zlib bzip2 libpng ]; # needed when linking against freetype
# dependence on harfbuzz is looser than the reverse dependence # 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. # FreeType requires GNU Make, which is not part of stdenv on FreeBSD.
++ optional (!stdenv.isLinux) gnumake; ++ optional (!stdenv.isLinux) gnumake;
@ -58,7 +58,10 @@ in stdenv.mkDerivation rec {
doCheck = true; 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") { crossAttrs = stdenv.lib.optionalAttrs (hostPlatform.libc or null != "msvcrt") {
# Somehow it calls the unwrapped gcc, "i686-pc-linux-gnu-gcc", instead # Somehow it calls the unwrapped gcc, "i686-pc-linux-gnu-gcc", instead