From 18f9b02f6d8d204f120c0f38063e2bba1629f0e7 Mon Sep 17 00:00:00 2001 From: Alex James Date: Sun, 10 Nov 2024 23:24:03 -0600 Subject: [PATCH] mkvtoolnix: migrate to new apple-sdk pattern Tracked by #354146. --- pkgs/applications/video/mkvtoolnix/default.nix | 3 +-- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 54fa98268a6f6..a180694e98db9 100644 --- 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 index 50d342fe4ecd1..d38bda47def5b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10507,9 +10507,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;