pyrox.dev
lol
Merge pull request #43519 from peterhoeg/u/matroska
libebml: 1.3.5 -> 1.3.6 and libmatroska: 1.4.8 -> 1.4.9
authored by
Peter Hoeg
and committed by
GitHub
d4f63206
fccbb2a9
+31
-16
+16
-8
pkgs/development/libraries/libebml/default.nix
+16
-8
pkgs/development/libraries/libebml/default.nix
···
1
-
{ stdenv, fetchurl }:
1
+
{ stdenv, fetchFromGitHub, cmake, pkgconfig }:
2
2
3
3
stdenv.mkDerivation rec {
4
-
name = "libebml-1.3.5";
4
+
name = "libebml-${version}";
5
+
version = "1.3.6";
5
6
6
-
src = fetchurl {
7
-
url = "https://dl.matroska.org/downloads/libebml/${name}.tar.xz";
8
-
sha256 = "005a0ipqnfbsq47zrc61zszi439jw32q5xd6dc1jyb3lc0zl266q";
7
+
src = fetchFromGitHub {
8
+
owner = "Matroska-Org";
9
+
repo = "libebml";
10
+
rev = "release-${version}";
11
+
sha256 = "0fl8d35ywj9id93yp78qlxy7j81kjri957agq40r420kmwac3dzs";
9
12
};
10
13
14
+
nativeBuildInputs = [ cmake pkgconfig ];
15
+
16
+
cmakeFlags = [
17
+
"-DBUILD_SHARED_LIBS=YES"
18
+
];
19
+
11
20
meta = with stdenv.lib; {
12
21
description = "Extensible Binary Meta Language library";
13
-
license = licenses.lgpl21;
14
22
homepage = https://dl.matroska.org/downloads/libebml/;
15
-
maintainers = [ maintainers.spwhitt ];
23
+
license = licenses.lgpl21;
24
+
maintainers = with maintainers; [ spwhitt ];
16
25
platforms = platforms.unix;
17
26
};
18
27
}
19
-
+15
-8
pkgs/development/libraries/libmatroska/default.nix
+15
-8
pkgs/development/libraries/libmatroska/default.nix
···
1
-
{ stdenv, fetchurl, pkgconfig, libebml }:
1
+
{ stdenv, fetchFromGitHub, cmake, pkgconfig
2
+
, libebml }:
2
3
3
4
stdenv.mkDerivation rec {
4
-
name = "libmatroska-1.4.8";
5
+
name = "libmatroska-${version}";
6
+
version = "1.4.9";
5
7
6
-
src = fetchurl {
7
-
url = "https://dl.matroska.org/downloads/libmatroska/${name}.tar.xz";
8
-
sha256 = "14n9sw974prr3yp4yjb7aadi6x2yz5a0hjw8fs3qigy5shh2piyq";
8
+
src = fetchFromGitHub {
9
+
owner = "Matroska-Org";
10
+
repo = "libmatroska";
11
+
rev = "release-${version}";
12
+
sha256 = "1hfrcpvmyqnvdkw8rz1z20zw7fpnjyl5h0g9ky7k6y1a44b1fz86";
9
13
};
10
14
11
-
nativeBuildInputs = [ pkgconfig ];
15
+
nativeBuildInputs = [ cmake pkgconfig ];
12
16
13
17
buildInputs = [ libebml ];
14
18
19
+
cmakeFlags = [
20
+
"-DBUILD_SHARED_LIBS=YES"
21
+
];
22
+
15
23
meta = with stdenv.lib; {
16
24
description = "A library to parse Matroska files";
17
25
homepage = https://matroska.org/;
18
26
license = licenses.lgpl21;
19
-
maintainers = [ maintainers.spwhitt ];
27
+
maintainers = with maintainers; [ spwhitt ];
20
28
platforms = platforms.unix;
21
29
};
22
30
}
23
-