diff options
| author | Michele Guerini Rocco <rnhmjoj@users.noreply.github.com> | 2021-03-15 00:38:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-15 00:38:22 +0100 |
| commit | 06e916ee7901b4b1252306ae767f0460bee5e70f (patch) | |
| tree | dab6f7fc005375776e1c19418417c186e13cd140 /pkgs/applications/video | |
| parent | 9b50aa683658976f96d3457296d2edefae19f4f0 (diff) | |
| parent | 9235d126cc377991479a81baac041040aef06d3c (diff) | |
Merge pull request #116296 from tricktron/mkvtoolnix-55
mkvtoolnix: 53.0.0 -> 55.0.0
Diffstat (limited to 'pkgs/applications/video')
| -rw-r--r-- | pkgs/applications/video/mkvtoolnix/default.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 39d2f1e21cee5..d26acfd7c0b56 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -13,13 +13,13 @@ with lib; stdenv.mkDerivation rec { pname = "mkvtoolnix"; - version = "53.0.0"; + version = "55.0.0"; src = fetchFromGitLab { owner = "mbunkus"; repo = "mkvtoolnix"; rev = "release-${version}"; - sha256 = "04wjs3sgb3gn85gl8y1svx177d1213hswx37zdsj80giw1k5df79"; + sha256 = "129azp4cpdd05f6072gkxdjj811aqs29nbw6v6qm8vv47gfvjcf7"; }; nativeBuildInputs = [ @@ -51,6 +51,7 @@ stdenv.mkDerivation rec { ]; CXXFLAGS = optional stdenv.cc.isClang "-std=c++17"; + LDFLAGS = optional stdenv.cc.isClang "-lc++fs"; dontWrapQtApps = true; postFixup = optionalString withGUI '' @@ -60,7 +61,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Cross-platform tools for Matroska"; homepage = "http://www.bunkus.org/videotools/mkvtoolnix/"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ codyopel rnhmjoj ]; platforms = platforms.linux ++ optionals (!withGUI) platforms.darwin; |