diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-01-19 01:18:25 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-19 01:18:25 +0000 |
commit | e8a1f18e58cc0e075de9f583ae547799b39f7489 (patch) | |
tree | 302b100cf3b232ea5fd16b04576999e6d892eaac /pkgs/development/libraries/fcft/default.nix | |
parent | 38553bd4923324ebd3c0d68eb53325588027bcb3 (diff) | |
parent | 726c05e5a8bda34a0bca5a12d42614be73e7439a (diff) |
Merge staging-next into staging
Diffstat (limited to 'pkgs/development/libraries/fcft/default.nix')
-rw-r--r-- | pkgs/development/libraries/fcft/default.nix | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/pkgs/development/libraries/fcft/default.nix b/pkgs/development/libraries/fcft/default.nix index 1ce09b63cbed..fd6f26c9789f 100644 --- a/pkgs/development/libraries/fcft/default.nix +++ b/pkgs/development/libraries/fcft/default.nix @@ -1,21 +1,28 @@ { stdenv, lib, fetchgit, pkg-config, meson, ninja, scdoc -,freetype, fontconfig, harfbuzz, pixman, tllist, check }: +, freetype, fontconfig, pixman, tllist, check +, withHarfBuzz ? true +, harfbuzz +}: stdenv.mkDerivation rec { pname = "fcft"; - version = "2.3.1"; + version = "2.3.2"; src = fetchgit { url = "https://codeberg.org/dnkl/fcft.git"; rev = version; - sha256 = "sha256-FD3KfaQbSEA1XdmS6YxH+c5fSsra9Ro/KKslb7Brv7U="; + sha256 = "0k2i57rakm4g86f7hbhkby8af0vv7v63a70lk3m58mkycpy5q2rm"; }; nativeBuildInputs = [ pkg-config meson ninja scdoc ]; - buildInputs = [ freetype fontconfig pixman tllist harfbuzz ]; + buildInputs = [ freetype fontconfig pixman tllist ] + ++ lib.optional withHarfBuzz harfbuzz; checkInputs = [ check ]; - mesonFlags = [ "--buildtype=release" ]; + mesonFlags = [ + "--buildtype=release" + "-Dtext-shaping=${if withHarfBuzz then "enabled" else "disabled"}" + ]; doCheck = true; |