diff options
| author | polykernel <81340136+polykernel@users.noreply.github.com> | 2021-10-16 00:10:26 -0400 |
|---|---|---|
| committer | Cole Helbling <cole.e.helbling@outlook.com> | 2021-10-20 15:37:11 -0700 |
| commit | 11dab9f5703cd34f1e5bd2e899f8f02cf549b22c (patch) | |
| tree | 15a232d7d80a909d330a68001d035a36b97b762a /pkgs/applications/misc/fuzzel/default.nix | |
| parent | 1c6c6b9563a2517844d286864197a796b696cfb6 (diff) | |
| download | nixpkgs-11dab9f5703cd34f1e5bd2e899f8f02cf549b22c.tar nixpkgs-11dab9f5703cd34f1e5bd2e899f8f02cf549b22c.tar.gz nixpkgs-11dab9f5703cd34f1e5bd2e899f8f02cf549b22c.tar.bz2 nixpkgs-11dab9f5703cd34f1e5bd2e899f8f02cf549b22c.tar.lz nixpkgs-11dab9f5703cd34f1e5bd2e899f8f02cf549b22c.tar.xz nixpkgs-11dab9f5703cd34f1e5bd2e899f8f02cf549b22c.tar.zst nixpkgs-11dab9f5703cd34f1e5bd2e899f8f02cf549b22c.zip | |
fuzzel: 1.6.1 -> 1.6.4
The SVG and PNG options were adjusted to account for upstream changes on the meson build options and additional nanosvg backend for SVG support independent of cairo.
Diffstat (limited to 'pkgs/applications/misc/fuzzel/default.nix')
| -rw-r--r-- | pkgs/applications/misc/fuzzel/default.nix | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/pkgs/applications/misc/fuzzel/default.nix b/pkgs/applications/misc/fuzzel/default.nix index e43304c5bc1..e099414c0c2 100644 --- a/pkgs/applications/misc/fuzzel/default.nix +++ b/pkgs/applications/misc/fuzzel/default.nix @@ -13,29 +13,24 @@ , tllist , fcft , enableCairo ? true -, enablePNG ? true -, enableSVG ? true +, withPNGBackend ? "libpng" +, withSVGBackend ? "librsvg" # Optional dependencies , cairo , librsvg , libpng }: -let - # Courtesy of sternenseemann and FRidh, commit c9a7fdfcfb420be8e0179214d0d91a34f5974c54 - mesonFeatureFlag = opt: b: "-D${opt}=${if b then "enabled" else "disabled"}"; -in - stdenv.mkDerivation rec { pname = "fuzzel"; - version = "1.6.1"; + version = "1.6.4"; src = fetchFromGitea { domain = "codeberg.org"; owner = "dnkl"; repo = "fuzzel"; rev = version; - sha256 = "sha256-JW5sAlTprSRIdFbmSaUreGtNccERgQMGEW+WCSscYQk="; + sha256 = "sha256-wl3dO6EwLXWf0XtAIml1NlNRIvpIQJuq1pxLmo/pAUE="; }; nativeBuildInputs = [ @@ -54,15 +49,15 @@ stdenv.mkDerivation rec { tllist fcft ] ++ lib.optional enableCairo cairo - ++ lib.optional enablePNG libpng - ++ lib.optional enableSVG librsvg; + ++ lib.optional (withPNGBackend == "libpng") libpng + ++ lib.optional (withSVGBackend == "librsvg") librsvg; mesonBuildType = "release"; mesonFlags = [ - (mesonFeatureFlag "enable-cairo" enableCairo) - (mesonFeatureFlag "enable-png" enablePNG) - (mesonFeatureFlag "enable-svg" enableSVG) + "-Denable-cairo=${if enableCairo then "enabled" else "disabled"}" + "-Dpng-backend=${withPNGBackend}" + "-Dsvg-backend=${withSVGBackend}" ]; meta = with lib; { |