From cabe7d650613f1617988eb7750b8eca336181b81 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 15 Jan 2019 00:57:24 -0600 Subject: freetype: re-enable freetype-config, don't break all the things --- pkgs/development/libraries/freetype/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/freetype/default.nix') diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix index b7189e26699..76df9514cf4 100644 --- a/pkgs/development/libraries/freetype/default.nix +++ b/pkgs/development/libraries/freetype/default.nix @@ -49,7 +49,7 @@ in stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - configureFlags = [ "--disable-static" "--bindir=$(dev)/bin" ]; + configureFlags = [ "--disable-static" "--bindir=$(dev)/bin" "--enable-freetype-config" ]; # native compiler to generate building tool CC_BUILD = "${buildPackages.stdenv.cc}/bin/cc"; @@ -61,5 +61,12 @@ in stdenv.mkDerivation rec { 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" + ''; + } -- cgit 1.4.1