From c64ea820ed10877969df06dc22f5f22996101959 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Tue, 5 Sep 2023 18:38:57 -0400 Subject: [PATCH] SDL2_ttf: use Harfbuzz from nixpkgs The vendored Harfbuzz fails to build with clang 16. Use the one from nixpkgs, which does. --- pkgs/development/libraries/SDL2_ttf/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/SDL2_ttf/default.nix b/pkgs/development/libraries/SDL2_ttf/default.nix index 66f53949c245..d2dd8d53929e 100644 --- a/pkgs/development/libraries/SDL2_ttf/default.nix +++ b/pkgs/development/libraries/SDL2_ttf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pkg-config, darwin, fetchurl, SDL2, freetype, libGL }: +{ lib, stdenv, pkg-config, darwin, fetchurl, SDL2, freetype, harfbuzz, libGL }: stdenv.mkDerivation rec { pname = "SDL2_ttf"; @@ -9,11 +9,12 @@ stdenv.mkDerivation rec { sha256 = "sha256-ncce2TSHUhsQeixKnKa/Q/ti9r3dXCawVea5FBiiIFM="; }; - configureFlags = lib.optional stdenv.isDarwin "--disable-sdltest"; + configureFlags = [ "--disable-harfbuzz-builtin" ] + ++ lib.optionals stdenv.isDarwin [ "--disable-sdltest" ]; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ SDL2 freetype ] + buildInputs = [ SDL2 freetype harfbuzz ] ++ lib.optional (!stdenv.isDarwin) libGL ++ lib.optional stdenv.isDarwin darwin.libobjc;