summary refs log tree commit diff
diff options
context:
space:
mode:
authorWilliam A. Kennington III <william@wkennington.com>2015-05-31 17:08:42 -0700
committerWilliam A. Kennington III <william@wkennington.com>2015-05-31 17:08:42 -0700
commite8fcd5dbef3c6a5a3cfec6478c6421ac44f7ae6a (patch)
treec5a0f622b8371add65ad1ffb12837432d6c0dcde
parenta10ae221d6b078f46eb52a8d6d1287f880576b9d (diff)
parentec7f3fb516e7af55704f63c950c4c4aa256b0e0d (diff)
downloadnixlib-e8fcd5dbef3c6a5a3cfec6478c6421ac44f7ae6a.tar
nixlib-e8fcd5dbef3c6a5a3cfec6478c6421ac44f7ae6a.tar.gz
nixlib-e8fcd5dbef3c6a5a3cfec6478c6421ac44f7ae6a.tar.bz2
nixlib-e8fcd5dbef3c6a5a3cfec6478c6421ac44f7ae6a.tar.lz
nixlib-e8fcd5dbef3c6a5a3cfec6478c6421ac44f7ae6a.tar.xz
nixlib-e8fcd5dbef3c6a5a3cfec6478c6421ac44f7ae6a.tar.zst
nixlib-e8fcd5dbef3c6a5a3cfec6478c6421ac44f7ae6a.zip
Merge pull request #8098 from codyopel/libass
libass: 0.12.1 -> 0.12.2
-rw-r--r--pkgs/development/libraries/libass/default.nix14
1 files changed, 6 insertions, 8 deletions
diff --git a/pkgs/development/libraries/libass/default.nix b/pkgs/development/libraries/libass/default.nix
index 77742c3d6259..502f95dca9a4 100644
--- a/pkgs/development/libraries/libass/default.nix
+++ b/pkgs/development/libraries/libass/default.nix
@@ -1,6 +1,5 @@
 { stdenv, fetchurl, pkgconfig, yasm
-, freetype ? null
-, fribidi ? null
+, freetype, fribidi
 , encaSupport ? true, enca ? null # enca support
 , fontconfigSupport ? true, fontconfig ? null # fontconfig support
 , harfbuzzSupport ? true, harfbuzz ? null # harfbuzz support
@@ -8,19 +7,18 @@
 , largeTilesSupport ? false # Use larger tiles in the rasterizer
 }:
 
-assert ((freetype != null) && (fribidi != null));
-assert encaSupport -> (enca != null);
-assert fontconfigSupport -> (fontconfig != null);
-assert harfbuzzSupport -> (harfbuzz != null);
+assert encaSupport -> enca != null;
+assert fontconfigSupport -> fontconfig != null;
+assert harfbuzzSupport -> harfbuzz != null;
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "libass-${version}";
-  version = "0.12.1";
+  version = "0.12.2";
 
   src = fetchurl {
     url = "https://github.com/libass/libass/releases/download/${version}/${name}.tar.xz";
-    sha256 = "1mwj2nk9g6cq6f8m1hf0ijg1299rghhy9naahqq43sc2whblb1l7";
+    sha256 = "1qzibgqmnnqk2r116lpk1br764g0v74f2zp12y5id0p1plaing37";
   };
 
   configureFlags = [