Skip to content

Commit

Permalink
mkvtoolnix: migrate to new apple-sdk pattern
Browse files Browse the repository at this point in the history
Tracked by NixOS#354146.
  • Loading branch information
al3xtjames committed Nov 11, 2024
1 parent 3f42f0b commit 18f9b02
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 deletions.
3 changes: 1 addition & 2 deletions pkgs/applications/video/mkvtoolnix/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 = ''
Expand Down
4 changes: 1 addition & 3 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 18f9b02

Please sign in to comment.