Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 8668910513ec
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 372f32f00949
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 5, 2020

  1. libass: 0.14.0 -> 0.15.0 

    Harfbuzz is now being required unconditionally as per
https://github.com/libass/libass/releases/tag/0.15.0

Fixes: CVE-2020-26682
    Max Hausch committed Nov 5, 2020
    Copy the full SHA
    8b8130f View commit details

  2. Merge pull request #101983 from cheriimoya/libass 

    [staging] libass 0.14.0 -> 0.15.0
    @mweinelt
    mweinelt authored Nov 5, 2020
    Copy the full SHA
    372f32f View commit details
Showing with 4 additions and 8 deletions.
  1. +4 −8 pkgs/development/libraries/libass/default.nix
12 changes: 4 additions & 8 deletions pkgs/development/libraries/libass/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
{ stdenv, fetchurl, pkgconfig, yasm
, freetype, fribidi
, freetype, fribidi, harfbuzz
, encaSupport ? true, enca ? null # enca support
, fontconfigSupport ? true, fontconfig ? null # fontconfig support
, harfbuzzSupport ? true, harfbuzz ? null # harfbuzz support
, rasterizerSupport ? false # Internal rasterizer
, largeTilesSupport ? false # Use larger tiles in the rasterizer
, libiconv
}:

assert encaSupport -> enca != null;
assert fontconfigSupport -> fontconfig != null;
assert harfbuzzSupport -> harfbuzz != null;

let
mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}";
@@ -19,27 +17,25 @@ in
with stdenv.lib;
stdenv.mkDerivation rec {
pname = "libass";
version = "0.14.0";
version = "0.15.0";

src = fetchurl {
url = "https://github.com/libass/libass/releases/download/${version}/${pname}-${version}.tar.xz";
sha256 = "18iqznl4mabhj9ywfsz4kwvbsplcv1jjxq50nxssvbj8my1267w8";
sha256 = "0cz8v6kh3f2j5rdjrra2z0h715fa16vjm7kambvqx9hak86262cz";
};

configureFlags = [
(mkFlag encaSupport "enca")
(mkFlag fontconfigSupport "fontconfig")
(mkFlag harfbuzzSupport "harfbuzz")
(mkFlag rasterizerSupport "rasterizer")
(mkFlag largeTilesSupport "large-tiles")
];

nativeBuildInputs = [ pkgconfig yasm ];

buildInputs = [ freetype fribidi ]
buildInputs = [ freetype fribidi harfbuzz ]
++ optional encaSupport enca
++ optional fontconfigSupport fontconfig
++ optional harfbuzzSupport harfbuzz
++ optional stdenv.isDarwin libiconv;

meta = {