Merge pull request #245775 from Artturin/freetypewindows1

authored by

Artturi and committed by
GitHub
7897d9c2 a29fa7b7

+4 -2
+4 -2
pkgs/development/libraries/freetype/default.nix
··· 61 62 doCheck = true; 63 64 - postInstall = glib.flattenInclude + '' 65 substituteInPlace $dev/bin/freetype-config \ 66 --replace ${buildPackages.pkg-config} ${pkgsHostHost.pkg-config} 67 - '' + lib.optionalString (!stdenv.hostPlatform.isWindows) '' 68 69 wrapProgram "$dev/bin/freetype-config" \ 70 --set PKG_CONFIG_PATH "$PKG_CONFIG_PATH:$dev/lib/pkgconfig"
··· 61 62 doCheck = true; 63 64 + postInstall = glib.flattenInclude 65 + # pkgsCross.mingwW64.pkg-config doesn't build 66 + # makeWrapper doesn't cross-compile to windows #120726 67 + + lib.optionalString (!stdenv.hostPlatform.isMinGW) '' 68 substituteInPlace $dev/bin/freetype-config \ 69 --replace ${buildPackages.pkg-config} ${pkgsHostHost.pkg-config} 70 71 wrapProgram "$dev/bin/freetype-config" \ 72 --set PKG_CONFIG_PATH "$PKG_CONFIG_PATH:$dev/lib/pkgconfig"