From 93f79d3d95fcc3aeb4a03fbb8f3d38fb4372b6fa Mon Sep 17 00:00:00 2001 From: Artturin Date: Thu, 27 Jul 2023 01:30:53 +0300 Subject: freetype: makeWrapper doesn't cross compile to windows Issue #120726 --- pkgs/development/libraries/freetype/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix index ed847cb3ffe..85070966086 100644 --- a/pkgs/development/libraries/freetype/default.nix +++ b/pkgs/development/libraries/freetype/default.nix @@ -38,7 +38,8 @@ stdenv.mkDerivation (finalAttrs: { propagatedBuildInputs = [ zlib bzip2 brotli libpng ]; # needed when linking against freetype # dependence on harfbuzz is looser than the reverse dependence - nativeBuildInputs = [ pkg-config which makeWrapper ] + nativeBuildInputs = [ pkg-config which ] + ++ lib.optional (!stdenv.hostPlatform.isWindows) makeWrapper # FreeType requires GNU Make, which is not part of stdenv on FreeBSD. ++ lib.optional (!stdenv.isLinux) gnumake; @@ -63,6 +64,7 @@ stdenv.mkDerivation (finalAttrs: { postInstall = glib.flattenInclude + '' 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" -- cgit 1.4.1