Merge pull request #245615 from Artturin/freetypewindows

freetype: makeWrapper doesn't cross compile to windows

authored by

Rick van Schijndel and committed by
GitHub
798c88ed b56ed968

+3 -1
+3 -1
pkgs/development/libraries/freetype/default.nix
··· 38 38 propagatedBuildInputs = [ zlib bzip2 brotli libpng ]; # needed when linking against freetype 39 39 40 40 # dependence on harfbuzz is looser than the reverse dependence 41 - nativeBuildInputs = [ pkg-config which makeWrapper ] 41 + nativeBuildInputs = [ pkg-config which ] 42 + ++ lib.optional (!stdenv.hostPlatform.isWindows) makeWrapper 42 43 # FreeType requires GNU Make, which is not part of stdenv on FreeBSD. 43 44 ++ lib.optional (!stdenv.isLinux) gnumake; 44 45 ··· 63 64 postInstall = glib.flattenInclude + '' 64 65 substituteInPlace $dev/bin/freetype-config \ 65 66 --replace ${buildPackages.pkg-config} ${pkgsHostHost.pkg-config} 67 + '' + lib.optionalString (!stdenv.hostPlatform.isWindows) '' 66 68 67 69 wrapProgram "$dev/bin/freetype-config" \ 68 70 --set PKG_CONFIG_PATH "$PKG_CONFIG_PATH:$dev/lib/pkgconfig"