summary refs log tree commit diff
path: root/pkgs/development/libraries/libmatroska
diff options
context:
space:
mode:
authorFranz Pletz <fpletz@fnordicwalking.de>2016-03-07 02:50:51 +0100
committerFranz Pletz <fpletz@fnordicwalking.de>2016-03-07 02:54:40 +0100
commit5e204092294e0763288d3c7fc42a29030b448f15 (patch)
tree4f149fb002cf166f01b15d2ca426615b23e2769b /pkgs/development/libraries/libmatroska
parent68702d24bfc1a6e0a299df43aecf1cacca141372 (diff)
downloadnixpkgs-5e204092294e0763288d3c7fc42a29030b448f15.tar
nixpkgs-5e204092294e0763288d3c7fc42a29030b448f15.tar.gz
nixpkgs-5e204092294e0763288d3c7fc42a29030b448f15.tar.bz2
nixpkgs-5e204092294e0763288d3c7fc42a29030b448f15.tar.lz
nixpkgs-5e204092294e0763288d3c7fc42a29030b448f15.tar.xz
nixpkgs-5e204092294e0763288d3c7fc42a29030b448f15.tar.zst
nixpkgs-5e204092294e0763288d3c7fc42a29030b448f15.zip
libmatroska: 1.4.1 -> 1.4.4 (security)
This fixes CVE-2015-8790 & CVE-2015-8791.
Diffstat (limited to 'pkgs/development/libraries/libmatroska')
-rw-r--r--pkgs/development/libraries/libmatroska/default.nix13
1 files changed, 6 insertions, 7 deletions
diff --git a/pkgs/development/libraries/libmatroska/default.nix b/pkgs/development/libraries/libmatroska/default.nix
index b4032f3c22d..134f6b1bf27 100644
--- a/pkgs/development/libraries/libmatroska/default.nix
+++ b/pkgs/development/libraries/libmatroska/default.nix
@@ -1,17 +1,16 @@
-{ stdenv, fetchurl, libebml }:
+{ stdenv, fetchurl, pkgconfig, libebml }:
 
 stdenv.mkDerivation rec {
-  name = "libmatroska-1.4.1";
+  name = "libmatroska-1.4.4";
 
   src = fetchurl {
     url = "http://dl.matroska.org/downloads/libmatroska/${name}.tar.bz2";
-    sha256 = "1dzglkl0hpimld1kahkrrp857hw5pg1r7xxbpnx7jmlj7s3j2vq8";
+    sha256 = "1mvb54q3gag9dj0pkwci8w75gp6mm14gi85y0ld3ar1rdngsmvyk";
   };
 
-  configurePhase = "cd make/linux";
-  makeFlags = "prefix=$(out) LIBEBML_INCLUDE_DIR=${libebml}/include LIBEBML_LIB_DIR=${libebml}/lib"
-    + stdenv.lib.optionalString stdenv.isDarwin " CXX=clang++";
-  propagatedBuildInputs = [ libebml ];
+  nativeBuildInputs = [ pkgconfig ];
+
+  buildInputs = [ libebml ];
 
   meta = with stdenv.lib; {
     description = "A library to parse Matroska files";