diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-07-27 06:01:53 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-07-27 06:01:53 +0000 |
commit | d1b1f7fda7b74c168fc5621e48b0704bb23f73ae (patch) | |
tree | f9321c785e131d79342c5f28efaacfabfe0513d1 /pkgs/development/libraries/freetype/default.nix | |
parent | 2d0e53e01347259dfccad857289cc96d2ed38e97 (diff) | |
parent | 86818bb1b1f0ba271a0fda87eb8f15f70cf7bd84 (diff) | |
download | nixpkgs-d1b1f7fda7b74c168fc5621e48b0704bb23f73ae.tar nixpkgs-d1b1f7fda7b74c168fc5621e48b0704bb23f73ae.tar.gz nixpkgs-d1b1f7fda7b74c168fc5621e48b0704bb23f73ae.tar.bz2 nixpkgs-d1b1f7fda7b74c168fc5621e48b0704bb23f73ae.tar.lz nixpkgs-d1b1f7fda7b74c168fc5621e48b0704bb23f73ae.tar.xz nixpkgs-d1b1f7fda7b74c168fc5621e48b0704bb23f73ae.tar.zst nixpkgs-d1b1f7fda7b74c168fc5621e48b0704bb23f73ae.zip |
Merge staging-next into staging
Diffstat (limited to 'pkgs/development/libraries/freetype/default.nix')
-rw-r--r-- | pkgs/development/libraries/freetype/default.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix index 9c5e49e046e..fc2adb673ec 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" |