b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

SDL2_ttf: use Harfbuzz from nixpkgs

Browse source 
The vendored Harfbuzz fails to build with clang 16. Use the one from
nixpkgs, which does.
This commit is contained in:
Randy Eckenrode 2023-09-05 18:38:57 -04:00
parent dba6d77ad2
commit c64ea820ed
No known key found for this signature in database
GPG key ID: 64C1CD4EC2A600D9
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkgs/development/libraries/SDL2_ttf/default.nix
View file

@ -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;