diff options
| author | Alyssa Ross <hi@alyssa.is> | 2020-07-13 23:20:04 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2020-07-13 23:21:06 +0000 |
| commit | a42c1d6d62656dcf9bd85de620f2e200a5ad22d8 (patch) | |
| tree | 7d481fea9872f62a034452612be17f4494159baa /nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix | |
| parent | 55f69a6b0e53c1c4b3e0396937c53bf5662b5519 (diff) | |
| parent | 9480bae337095fd24f61380bce3174fdfe926a00 (diff) | |
| download | nixlib-a42c1d6d62656dcf9bd85de620f2e200a5ad22d8.tar nixlib-a42c1d6d62656dcf9bd85de620f2e200a5ad22d8.tar.gz nixlib-a42c1d6d62656dcf9bd85de620f2e200a5ad22d8.tar.bz2 nixlib-a42c1d6d62656dcf9bd85de620f2e200a5ad22d8.tar.lz nixlib-a42c1d6d62656dcf9bd85de620f2e200a5ad22d8.tar.xz nixlib-a42c1d6d62656dcf9bd85de620f2e200a5ad22d8.tar.zst nixlib-a42c1d6d62656dcf9bd85de620f2e200a5ad22d8.zip | |
Merge commit '9480bae337095fd24f61380bce3174fdfe926a00'
This is the last nixos-unstable release before 13b2903169f, which I'm a bit nervous about. So I want the update including that one to be as small as possible, hence going to this one first.
Diffstat (limited to 'nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix b/nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix index 7db27888782a..68f3cac1bfac 100644 --- a/nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix +++ b/nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix @@ -13,13 +13,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "mkvtoolnix"; - version = "46.0.0"; + version = "47.0.0"; src = fetchFromGitLab { owner = "mbunkus"; repo = "mkvtoolnix"; rev = "release-${version}"; - sha256 = "1vyfvpsllnzhzaaz3s9lqlnkmnqchyhxj2d47bfyizs982r5kg24"; + sha256 = "1s8y9khyfjg06mr7rmm26pk0b3nbkcrs56r29a9l57wbkqyl7qp9"; }; nativeBuildInputs = [ @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { (enableFeature withGUI "qt") ]; - CXXFLAGS = optional stdenv.cc.isClang "-std=c++14"; + CXXFLAGS = optional stdenv.cc.isClang "-std=c++17"; dontWrapQtApps = true; postFixup = optionalString withGUI '' |