diff options
author | Alyssa Ross <hi@alyssa.is> | 2022-01-03 23:55:00 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2022-02-19 11:03:39 +0000 |
commit | f4cf97a04cd5d0b86aa46baec9fb228a8f671c03 (patch) | |
tree | 28192415ff39a661d0001563bf81cc93fa25d16d /nixpkgs/pkgs/development/libraries/fcft | |
parent | f8422837c9bde058e8f2de37702e7e94b2226040 (diff) | |
parent | 18c84ea816348e2a098390101b92d1e39a9dbd45 (diff) | |
download | nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.gz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.bz2 nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.lz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.xz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.zst nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.zip |
Merge commit '18c84ea816348e2a098390101b92d1e39a9dbd45'
Conflicts: nixpkgs/nixos/modules/misc/documentation.nix nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/go-modules/generic/default.nix nixpkgs/pkgs/development/interpreters/ruby/default.nix nixpkgs/pkgs/development/interpreters/ruby/patchsets.nix nixpkgs/pkgs/development/libraries/boehm-gc/7.6.6.nix nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix nixpkgs/pkgs/servers/mail/mailman/web.nix nixpkgs/pkgs/top-level/aliases.nix nixpkgs/pkgs/top-level/all-packages.nix nixpkgs/pkgs/top-level/impure.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/fcft')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/fcft/default.nix | 33 |
1 files changed, 25 insertions, 8 deletions
diff --git a/nixpkgs/pkgs/development/libraries/fcft/default.nix b/nixpkgs/pkgs/development/libraries/fcft/default.nix index 8f2d56fad285..de20caf22fbc 100644 --- a/nixpkgs/pkgs/development/libraries/fcft/default.nix +++ b/nixpkgs/pkgs/development/libraries/fcft/default.nix @@ -1,39 +1,56 @@ { stdenv, lib, fetchFromGitea, pkg-config, meson, ninja, scdoc , freetype, fontconfig, pixman, tllist, check -, withHarfBuzz ? true -, harfbuzz +# Text shaping methods to enable, empty list disables all text shaping. +# See `availableShapingTypes` or upstream meson_options.txt for available types. +, withShapingTypes ? [ "grapheme" "run" ] +, harfbuzz, utf8proc +, fcft # for passthru.tests }: let + # Needs to be reflect upstream meson_options.txt + availableShapingTypes = [ + "grapheme" + "run" + ]; + # Courtesy of sternenseemann and FRidh, commit c9a7fdfcfb420be8e0179214d0d91a34f5974c54 mesonFeatureFlag = opt: b: "-D${opt}=${if b then "enabled" else "disabled"}"; in stdenv.mkDerivation rec { pname = "fcft"; - version = "2.4.5"; + version = "2.5.1"; src = fetchFromGitea { domain = "codeberg.org"; owner = "dnkl"; repo = "fcft"; rev = version; - sha256 = "0z4bqap88pydkgcxrsvm3fmcyhi9x7z8knliarvdcvqlk7qnyzfh"; + sha256 = "0dn0ic2ddi5qz6nqscsn7nlih67ad8vpclppbqwas6xavdfq6va2"; }; depsBuildBuild = [ pkg-config ]; nativeBuildInputs = [ pkg-config meson ninja scdoc ]; buildInputs = [ freetype fontconfig pixman tllist ] - ++ lib.optional withHarfBuzz harfbuzz; + ++ lib.optionals (withShapingTypes != []) [ harfbuzz ] + ++ lib.optionals (builtins.elem "run" withShapingTypes) [ utf8proc ]; checkInputs = [ check ]; mesonBuildType = "release"; - mesonFlags = [ - (mesonFeatureFlag "text-shaping" withHarfBuzz) - ]; + mesonFlags = builtins.map (t: + mesonFeatureFlag "${t}-shaping" (lib.elem t withShapingTypes) + ) availableShapingTypes; doCheck = true; + outputs = [ "out" "doc" "man" ]; + + passthru.tests = { + noShaping = fcft.override { withShapingTypes = []; }; + onlyGraphemeShaping = fcft.override { withShapingTypes = [ "grapheme" ]; }; + }; + meta = with lib; { homepage = "https://codeberg.org/dnkl/fcft"; changelog = "https://codeberg.org/dnkl/fcft/releases/tag/${version}"; |