From 8bddf58c4aa5dbdd4b60b087aa30c32451ade21d Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 9 Sep 2023 21:25:11 +0100 Subject: freetype: enable 64-bit API on 32-bit systems Without the change `pkgsi686Linux.fontconfig` test fails to find the font on filesystems with 64-bit inodes: fontconfig> FAIL: test-bz106632 This happens because `freetype` uses 32-bit `fstat()` API in builds/unix/ftsystem.c without explicit 64-bit bit switch on. --- pkgs/development/libraries/freetype/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'pkgs/development') diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix index f4a81633f54..6e6989d9304 100644 --- a/pkgs/development/libraries/freetype/default.nix +++ b/pkgs/development/libraries/freetype/default.nix @@ -55,7 +55,8 @@ stdenv.mkDerivation (finalAttrs: { CC_BUILD = "${buildPackages.stdenv.cc}/bin/cc"; # The asm for armel is written with the 'asm' keyword. - CFLAGS = lib.optionalString stdenv.isAarch32 "-std=gnu99"; + CFLAGS = lib.optionalString stdenv.isAarch32 "-std=gnu99" + + lib.optionalString stdenv.hostPlatform.is32bit " -D_FILE_OFFSET_BITS=64"; enableParallelBuilding = true; -- cgit 1.4.1