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

freetype: re-enable freetype-config, don't break all the things

This commit is contained in:
Will Dietz 2019-01-15 00:57:24 -06:00 committed by Franz Pletz
parent b0757da432
commit cabe7d6506
No known key found for this signature in database
GPG Key ID: 846FDED7792617B4
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -49,7 +49,7 @@ in stdenv.mkDerivation rec {
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
configureFlags = [ "--disable-static" "--bindir=$(dev)/bin" ]; configureFlags = [ "--disable-static" "--bindir=$(dev)/bin" "--enable-freetype-config" ];
# native compiler to generate building tool # native compiler to generate building tool
CC_BUILD = "${buildPackages.stdenv.cc}/bin/cc"; CC_BUILD = "${buildPackages.stdenv.cc}/bin/cc";
@ -61,5 +61,12 @@ in stdenv.mkDerivation rec {
doCheck = true; doCheck = true;
postInstall = glib.flattenInclude; postInstall = glib.flattenInclude + ''
substituteInPlace $dev/bin/freetype-config \
--replace ${buildPackages.pkgconfig} ${pkgconfig}
wrapProgram "$dev/bin/freetype-config" \
--set PKG_CONFIG_PATH "$PKG_CONFIG_PATH:$dev/lib/pkgconfig"
'';
} }