Unverified Commit fa72bc2a authored by Michele Guerini Rocco's avatar Michele Guerini Rocco Committed by GitHub
Browse files

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

parents 21b29ebe 18f9b02f

pkgs/applications/video/mkvtoolnix/default.nix

+1 −2
Original line number Diff line number Diff line
@@ -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 = ''

pkgs/top-level/all-packages.nix

+1 −3
Original line number Diff line number Diff line
@@ -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;