mkvtoolnix: migrate to new apple-sdk pattern (#355135)

NixOS · Nov 12, 2024 · fa72bc2 · fa72bc2
2 parents 21b29eb + 18f9b02
commit fa72bc2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix
@@ -99,8 +99,7 @@ stdenv.mkDerivation rec {
     zlib
   ]
   ++ optionals withGUI [ cmark ]
-  ++ optionals stdenv.hostPlatform.isLinux [ qtwayland ]
-  ++ optionals stdenv.hostPlatform.isDarwin [ libiconv ];
+  ++ optionals stdenv.hostPlatform.isLinux [ qtwayland ];
 
   # autoupdate is not needed but it silences a ton of pointless warnings
   postPatch = ''

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -10500,9 +10500,7 @@ with pkgs;
     inherit (darwin.apple_sdk_11_0.frameworks) AppKit Cocoa Carbon CoreAudio CoreMIDI CoreServices Kernel;
   };
 
-  mkvtoolnix = qt6Packages.callPackage ../applications/video/mkvtoolnix {
-    stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
-  };
+  mkvtoolnix = qt6Packages.callPackage ../applications/video/mkvtoolnix { };
 
   mkvtoolnix-cli = mkvtoolnix.override {
     withGUI = false;