diff options
author | Mario Rodas <marsam@users.noreply.github.com> | 2019-09-18 18:13:36 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-09-18 18:13:36 -0500 |
commit | 6890d08b137d0d7574d7d8b56350517ebde94dc8 (patch) | |
tree | a7839881fee037eb4b65ea3509ed2be261708e14 /pkgs/applications/video | |
parent | e79d20c16e1bfc7b0d59f7ebca7b930dc529db63 (diff) | |
parent | fa64037b9968414ebec83d97d3536d5e841c5bda (diff) |
Merge pull request #69006 from marsam/fix-mkvtoolnix
mkvtoolnix: fix build with clang
Diffstat (limited to 'pkgs/applications/video')
-rw-r--r-- | pkgs/applications/video/mkvtoolnix/default.nix | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 04ddbbb8c06..af917981e1c 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -50,6 +50,8 @@ stdenv.mkDerivation rec { (enableFeature withGUI "qt") ]; + CXXFLAGS = optional stdenv.cc.isClang "-std=c++14"; + dontWrapQtApps = true; postFixup = optionalString withGUI '' wrapQtApp $out/bin/mkvtoolnix-gui |