Merge pull request #245775 from Artturin/freetypewindows1

Artturi 7897d9c2 a29fa7b7

Changed files
+4 -2
pkgs
development
libraries
freetype
+4 -2
pkgs/development/libraries/freetype/default.nix
···
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"