Skip to content

Commit fa72bc2

Browse files
authored
mkvtoolnix: migrate to new apple-sdk pattern (#355135)
2 parents 21b29eb + 18f9b02 commit fa72bc2

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

pkgs/applications/video/mkvtoolnix/default.nix

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,7 @@ stdenv.mkDerivation rec {
9999
zlib
100100
]
101101
++ optionals withGUI [ cmark ]
102-
++ optionals stdenv.hostPlatform.isLinux [ qtwayland ]
103-
++ optionals stdenv.hostPlatform.isDarwin [ libiconv ];
102+
++ optionals stdenv.hostPlatform.isLinux [ qtwayland ];
104103

105104
# autoupdate is not needed but it silences a ton of pointless warnings
106105
postPatch = ''

pkgs/top-level/all-packages.nix

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10500,9 +10500,7 @@ with pkgs;
1050010500
inherit (darwin.apple_sdk_11_0.frameworks) AppKit Cocoa Carbon CoreAudio CoreMIDI CoreServices Kernel;
1050110501
};
1050210502

10503-
mkvtoolnix = qt6Packages.callPackage ../applications/video/mkvtoolnix {
10504-
stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
10505-
};
10503+
mkvtoolnix = qt6Packages.callPackage ../applications/video/mkvtoolnix { };
1050610504

1050710505
mkvtoolnix-cli = mkvtoolnix.override {
1050810506
withGUI = false;

0 commit comments

Comments
 (0)