public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #43519 from peterhoeg/u/matroska 

libebml: 1.3.5 -> 1.3.6 and libmatroska: 1.4.8 -> 1.4.9
This commit is contained in:
Peter Hoeg 2018-07-14 22:26:30 +08:00 committed by GitHub
parent fccbb2a9e6 85f44394a1
commit d4f63206d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 31 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pkgs/development/libraries/libebml/default.nix
View File

@ -1,19 +1,27 @@
{ stdenv, fetchurl }: { stdenv, fetchFromGitHub, cmake, pkgconfig }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libebml-1.3.5"; name = "libebml-${version}";
version = "1.3.6";
src = fetchurl { src = fetchFromGitHub {
url = "https://dl.matroska.org/downloads/libebml/${name}.tar.xz"; owner = "Matroska-Org";
sha256 = "005a0ipqnfbsq47zrc61zszi439jw32q5xd6dc1jyb3lc0zl266q"; repo = "libebml";
rev = "release-${version}";
sha256 = "0fl8d35ywj9id93yp78qlxy7j81kjri957agq40r420kmwac3dzs";
}; };
nativeBuildInputs = [ cmake pkgconfig ];
cmakeFlags = [
"-DBUILD_SHARED_LIBS=YES"
];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Extensible Binary Meta Language library"; description = "Extensible Binary Meta Language library";
license = licenses.lgpl21;
homepage = https://dl.matroska.org/downloads/libebml/; homepage = https://dl.matroska.org/downloads/libebml/;
maintainers = [ maintainers.spwhitt ]; license = licenses.lgpl21;
maintainers = with maintainers; [ spwhitt ];
platforms = platforms.unix; platforms = platforms.unix;
}; };
} }

23
pkgs/development/libraries/libmatroska/default.nix
View File

@ -1,23 +1,30 @@
{ stdenv, fetchurl, pkgconfig, libebml }: { stdenv, fetchFromGitHub, cmake, pkgconfig
, libebml }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libmatroska-1.4.8"; name = "libmatroska-${version}";
version = "1.4.9";
src = fetchurl { src = fetchFromGitHub {
url = "https://dl.matroska.org/downloads/libmatroska/${name}.tar.xz"; owner = "Matroska-Org";
sha256 = "14n9sw974prr3yp4yjb7aadi6x2yz5a0hjw8fs3qigy5shh2piyq"; repo = "libmatroska";
rev = "release-${version}";
sha256 = "1hfrcpvmyqnvdkw8rz1z20zw7fpnjyl5h0g9ky7k6y1a44b1fz86";
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ libebml ]; buildInputs = [ libebml ];
cmakeFlags = [
"-DBUILD_SHARED_LIBS=YES"
];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A library to parse Matroska files"; description = "A library to parse Matroska files";
homepage = https://matroska.org/; homepage = https://matroska.org/;
license = licenses.lgpl21; license = licenses.lgpl21;
maintainers = [ maintainers.spwhitt ]; maintainers = with maintainers; [ spwhitt ];
platforms = platforms.unix; platforms = platforms.unix;
}; };
} }