nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-07-23 00:50:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Michele Guerini Rocco
2024-11-12 08:02:51 +01:00
committed by GitHub
parent 21b29ebe86 18f9b02f6d
commit fa72bc2abc
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/applications/video/mkvtoolnix/default.nix
View File

@@ -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 = ''

4
pkgs/top-level/all-packages.nix
View File

@@ -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;