diff options
author | Sandro <sandro.jaeckel@gmail.com> | 2021-01-18 20:43:55 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-18 20:43:55 +0100 |
commit | 533c150d18e5be562c0454f77259c30d3e2e9da9 (patch) | |
tree | dce204739c162df28d1c30f463d509dc2f0d7beb | |
parent | 8c3229e30367cd86f6246854ff238f0b0b22a934 (diff) | |
parent | eab35e481d7cf9af1fb0d8f6028c75b070ab43db (diff) | |
download | nixlib-533c150d18e5be562c0454f77259c30d3e2e9da9.tar nixlib-533c150d18e5be562c0454f77259c30d3e2e9da9.tar.gz nixlib-533c150d18e5be562c0454f77259c30d3e2e9da9.tar.bz2 nixlib-533c150d18e5be562c0454f77259c30d3e2e9da9.tar.lz nixlib-533c150d18e5be562c0454f77259c30d3e2e9da9.tar.xz nixlib-533c150d18e5be562c0454f77259c30d3e2e9da9.tar.zst nixlib-533c150d18e5be562c0454f77259c30d3e2e9da9.zip |
Merge pull request #107153 from sternenseemann/fcft-2.3.2
-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; |