summary refs log tree commit diff
diff options
context:
space:
mode:
authorSebastián Mancilla <238528+smancill@users.noreply.github.com>2021-08-13 14:41:59 -0400
committerGitHub <noreply@github.com>2021-08-13 14:41:59 -0400
commitcfda443b6874f37a2373626a616c005de5635a94 (patch)
tree39ebd3ae5a48ded8ea1d7194237dcac0b200781b
parentc93884185aae0b1ccbab6766482c5629b1b9cbd2 (diff)
downloadnixpkgs-cfda443b6874f37a2373626a616c005de5635a94.tar
nixpkgs-cfda443b6874f37a2373626a616c005de5635a94.tar.gz
nixpkgs-cfda443b6874f37a2373626a616c005de5635a94.tar.bz2
nixpkgs-cfda443b6874f37a2373626a616c005de5635a94.tar.lz
nixpkgs-cfda443b6874f37a2373626a616c005de5635a94.tar.xz
nixpkgs-cfda443b6874f37a2373626a616c005de5635a94.tar.zst
nixpkgs-cfda443b6874f37a2373626a616c005de5635a94.zip
mkvtoolnix: 59.0.0 -> 60.0.0 (#133688)
Use stdenv.mkDerivation instead of mkDerivation from libsForQt5, because
the latter forces the compiler to LLVM 5 on Darwin, which doesn't
support the new C++ filesystem library.

Fixes #132675.
-rw-r--r--pkgs/applications/video/mkvtoolnix/default.nix7
1 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix
index 8557c47ad77..7cffcd923ff 100644
--- a/pkgs/applications/video/mkvtoolnix/default.nix
+++ b/pkgs/applications/video/mkvtoolnix/default.nix
@@ -1,6 +1,5 @@
 { lib
 , stdenv
-, mkDerivation
 , fetchFromGitLab
 , pkg-config
 , autoreconfHook
@@ -46,15 +45,15 @@ let
     '';
 
 in
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "mkvtoolnix";
-  version = "59.0.0";
+  version = "60.0.0";
 
   src = fetchFromGitLab {
     owner = "mbunkus";
     repo = "mkvtoolnix";
     rev = "release-${version}";
-    sha256 = "sha256-bPypOsveXrkz1V961b9GTJKFdgru/kcW15z/yik/4yQ=";
+    sha256 = "sha256-WtEC/EH0G1Tm6OK6hmVRzloLkO8mxxOYYZY7k/Wi2zE=";
   };
 
   nativeBuildInputs = [