cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #245775 from Artturin/freetypewindows1

Browse source
This commit is contained in:
Artturi 2023-07-28 17:57:44 +03:00 committed by GitHub
commit 7897d9c2bd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/development/libraries/freetype/default.nix
View file

@ -61,10 +61,12 @@ stdenv.mkDerivation (finalAttrs: {
doCheck = true; 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 \ substituteInPlace $dev/bin/freetype-config \
--replace ${buildPackages.pkg-config} ${pkgsHostHost.pkg-config} --replace ${buildPackages.pkg-config} ${pkgsHostHost.pkg-config}
'' + lib.optionalString (!stdenv.hostPlatform.isWindows) ''
wrapProgram "$dev/bin/freetype-config" \ wrapProgram "$dev/bin/freetype-config" \
--set PKG_CONFIG_PATH "$PKG_CONFIG_PATH:$dev/lib/pkgconfig" --set PKG_CONFIG_PATH "$PKG_CONFIG_PATH:$dev/lib/pkgconfig"