diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-09-14 13:17:39 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-09-14 13:17:39 +0000 |
commit | 56e87d10ec12e00eab5c4b5710e01ab50eec267f (patch) | |
tree | baff33c3da97619d02441379b3f0f369da8f3d5a /nixpkgs/pkgs/development/libraries/SDL2_ttf | |
parent | cc14c6e02d8424c1d446d248f71e08243181af8d (diff) | |
parent | 3a2786eea085f040a66ecde1bc3ddc7099f6dbeb (diff) | |
download | nixlib-56e87d10ec12e00eab5c4b5710e01ab50eec267f.tar nixlib-56e87d10ec12e00eab5c4b5710e01ab50eec267f.tar.gz nixlib-56e87d10ec12e00eab5c4b5710e01ab50eec267f.tar.bz2 nixlib-56e87d10ec12e00eab5c4b5710e01ab50eec267f.tar.lz nixlib-56e87d10ec12e00eab5c4b5710e01ab50eec267f.tar.xz nixlib-56e87d10ec12e00eab5c4b5710e01ab50eec267f.tar.zst nixlib-56e87d10ec12e00eab5c4b5710e01ab50eec267f.zip |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/SDL2_ttf')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/SDL2_ttf/default.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/nixpkgs/pkgs/development/libraries/SDL2_ttf/default.nix b/nixpkgs/pkgs/development/libraries/SDL2_ttf/default.nix index 66f53949c245..d2dd8d53929e 100644 --- a/nixpkgs/pkgs/development/libraries/SDL2_ttf/default.nix +++ b/nixpkgs/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; |