Merge pull request #245775 from Artturin/freetypewindows1
This commit is contained in:
commit
7897d9c2bd
|
@ -61,10 +61,12 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
|
||||
doCheck = true;
|
||||
|
||||
postInstall = glib.flattenInclude + ''
|
||||
postInstall = glib.flattenInclude
|
||||
# pkgsCross.mingwW64.pkg-config doesn't build
|
||||
# makeWrapper doesn't cross-compile to windows #120726
|
||||
+ lib.optionalString (!stdenv.hostPlatform.isMinGW) ''
|
||||
substituteInPlace $dev/bin/freetype-config \
|
||||
--replace ${buildPackages.pkg-config} ${pkgsHostHost.pkg-config}
|
||||
'' + lib.optionalString (!stdenv.hostPlatform.isWindows) ''
|
||||
|
||||
wrapProgram "$dev/bin/freetype-config" \
|
||||
--set PKG_CONFIG_PATH "$PKG_CONFIG_PATH:$dev/lib/pkgconfig"
|
||||
|
|
Loading…
Reference in a new issue