diff options
| author | Will Dietz <w@wdtz.org> | 2019-01-15 00:57:24 -0600 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2019-01-16 22:43:19 +0100 |
| commit | cabe7d650613f1617988eb7750b8eca336181b81 (patch) | |
| tree | ea379eb90354264d6237d450e22180dcc7ffcc55 /pkgs/development/libraries/freetype | |
| parent | b0757da432ffc4b1e5b696b51ae81b36feb2d285 (diff) | |
| download | nixpkgs-cabe7d650613f1617988eb7750b8eca336181b81.tar nixpkgs-cabe7d650613f1617988eb7750b8eca336181b81.tar.gz nixpkgs-cabe7d650613f1617988eb7750b8eca336181b81.tar.bz2 nixpkgs-cabe7d650613f1617988eb7750b8eca336181b81.tar.lz nixpkgs-cabe7d650613f1617988eb7750b8eca336181b81.tar.xz nixpkgs-cabe7d650613f1617988eb7750b8eca336181b81.tar.zst nixpkgs-cabe7d650613f1617988eb7750b8eca336181b81.zip | |
freetype: re-enable freetype-config, don't break all the things
Diffstat (limited to 'pkgs/development/libraries/freetype')
| -rw-r--r-- | pkgs/development/libraries/freetype/default.nix | 11 |
1 files changed, 9 insertions, 2 deletions
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" + ''; + } |