diff options
| author | Randy Eckenrode <randy@largeandhighquality.com> | 2023-09-05 18:38:57 -0400 |
|---|---|---|
| committer | Randy Eckenrode <randy@largeandhighquality.com> | 2023-09-06 09:53:02 -0400 |
| commit | c64ea820ed10877969df06dc22f5f22996101959 (patch) | |
| tree | 9ef4435a0caafa1d9c48dae35ae0aaf8619bdd5f /pkgs/development/libraries/SDL2_ttf | |
| parent | dba6d77ad232e3a5ffc5e281ebbada4fe0e23981 (diff) | |
| download | nixpkgs-c64ea820ed10877969df06dc22f5f22996101959.tar nixpkgs-c64ea820ed10877969df06dc22f5f22996101959.tar.gz nixpkgs-c64ea820ed10877969df06dc22f5f22996101959.tar.bz2 nixpkgs-c64ea820ed10877969df06dc22f5f22996101959.tar.lz nixpkgs-c64ea820ed10877969df06dc22f5f22996101959.tar.xz nixpkgs-c64ea820ed10877969df06dc22f5f22996101959.tar.zst nixpkgs-c64ea820ed10877969df06dc22f5f22996101959.zip | |
SDL2_ttf: use Harfbuzz from nixpkgs
The vendored Harfbuzz fails to build with clang 16. Use the one from nixpkgs, which does.
Diffstat (limited to 'pkgs/development/libraries/SDL2_ttf')
| -rw-r--r-- | pkgs/development/libraries/SDL2_ttf/default.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/development/libraries/SDL2_ttf/default.nix b/pkgs/development/libraries/SDL2_ttf/default.nix index 66f53949c24..d2dd8d53929 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; |