dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #116296 from tricktron/mkvtoolnix-55

Browse Source 
mkvtoolnix: 53.0.0 -> 55.0.0
This commit is contained in:
Michele Guerini Rocco 2021-03-15 00:38:22 +01:00 committed by GitHub
commit 06e916ee79
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/applications/video/mkvtoolnix/default.nix
View File

@ -13,13 +13,13 @@ with lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mkvtoolnix"; pname = "mkvtoolnix";
version = "53.0.0"; version = "55.0.0";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "mbunkus"; owner = "mbunkus";
repo = "mkvtoolnix"; repo = "mkvtoolnix";
rev = "release-${version}"; rev = "release-${version}";
sha256 = "04wjs3sgb3gn85gl8y1svx177d1213hswx37zdsj80giw1k5df79"; sha256 = "129azp4cpdd05f6072gkxdjj811aqs29nbw6v6qm8vv47gfvjcf7";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -51,6 +51,7 @@ stdenv.mkDerivation rec {
]; ];
CXXFLAGS = optional stdenv.cc.isClang "-std=c++17"; CXXFLAGS = optional stdenv.cc.isClang "-std=c++17";
LDFLAGS = optional stdenv.cc.isClang "-lc++fs";
dontWrapQtApps = true; dontWrapQtApps = true;
postFixup = optionalString withGUI '' postFixup = optionalString withGUI ''
@ -60,7 +61,7 @@ stdenv.mkDerivation rec {
meta = with lib; { meta = with lib; {
description = "Cross-platform tools for Matroska"; description = "Cross-platform tools for Matroska";
homepage = "http://www.bunkus.org/videotools/mkvtoolnix/"; homepage = "http://www.bunkus.org/videotools/mkvtoolnix/";
license = licenses.gpl2; license = licenses.gpl2Only;
maintainers = with maintainers; [ codyopel rnhmjoj ]; maintainers = with maintainers; [ codyopel rnhmjoj ];
platforms = platforms.linux platforms = platforms.linux
++ optionals (!withGUI) platforms.darwin; ++ optionals (!withGUI) platforms.darwin;

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

@ -2,19 +2,20 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libebml"; pname = "libebml";
version = "1.4.1"; version = "1.4.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Matroska-Org"; owner = "Matroska-Org";
repo = "libebml"; repo = "libebml";
rev = "release-${version}"; rev = "release-${version}";
sha256 = "04bn1i7g4vwmkv3hv26rmcb59zkl2rh37qnfjm52j560bjlyd7im"; sha256 = "1hiilnabar826lfxsaflqjhgsdli6hzzhjv8q2nmw36fvvlyks25";
}; };
nativeBuildInputs = [ cmake pkg-config ]; nativeBuildInputs = [ cmake pkg-config ];
cmakeFlags = [ cmakeFlags = [
"-DBUILD_SHARED_LIBS=YES" "-DBUILD_SHARED_LIBS=YES"
"-DCMAKE_INSTALL_PREFIX="
]; ];
meta = with lib; { meta = with lib; {

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

@ -3,13 +3,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libmatroska"; pname = "libmatroska";
version = "1.6.2"; version = "1.6.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Matroska-Org"; owner = "Matroska-Org";
repo = "libmatroska"; repo = "libmatroska";
rev = "release-${version}"; rev = "release-${version}";
sha256 = "0yhr9hhgljva1fx3b0r4s3wkkypdfgsysbl35a4g3krkbhaa9rsd"; sha256 = "01dg12ndxfdqgjx5v2qy4mff6xjdxglywyg82sr3if5aw6rp3dji";
}; };
nativeBuildInputs = [ cmake pkg-config ]; nativeBuildInputs = [ cmake pkg-config ];
@ -18,6 +18,7 @@ stdenv.mkDerivation rec {
cmakeFlags = [ cmakeFlags = [
"-DBUILD_SHARED_LIBS=YES" "-DBUILD_SHARED_LIBS=YES"
"-DCMAKE_INSTALL_PREFIX="
]; ];
meta = with lib; { meta = with lib; {