Merge pull request #245452 from reckenrode/mpv-fixes
This commit is contained in:
commit
e8d63b1a46
@ -67,7 +67,7 @@
|
|||||||
, sdl2Support ? true, SDL2
|
, sdl2Support ? true, SDL2
|
||||||
, sixelSupport ? false, libsixel
|
, sixelSupport ? false, libsixel
|
||||||
, speexSupport ? true, speex
|
, speexSupport ? true, speex
|
||||||
, swiftSupport ? stdenv.isDarwin && stdenv.isAarch64, swift
|
, swiftSupport ? stdenv.isDarwin, swift
|
||||||
, theoraSupport ? true, libtheora
|
, theoraSupport ? true, libtheora
|
||||||
, vaapiSupport ? x11Support || waylandSupport, libva
|
, vaapiSupport ? x11Support || waylandSupport, libva
|
||||||
, vapoursynthSupport ? false, vapoursynth
|
, vapoursynthSupport ? false, vapoursynth
|
||||||
@ -82,7 +82,20 @@ let
|
|||||||
inherit (darwin.apple_sdk_11_0.frameworks)
|
inherit (darwin.apple_sdk_11_0.frameworks)
|
||||||
AVFoundation CoreFoundation CoreMedia Cocoa CoreAudio MediaPlayer Accelerate;
|
AVFoundation CoreFoundation CoreMedia Cocoa CoreAudio MediaPlayer Accelerate;
|
||||||
luaEnv = lua.withPackages (ps: with ps; [ luasocket ]);
|
luaEnv = lua.withPackages (ps: with ps; [ luasocket ]);
|
||||||
in stdenv.mkDerivation (finalAttrs: {
|
|
||||||
|
overrideSDK = platform: version:
|
||||||
|
platform // lib.optionalAttrs (platform ? darwinMinVersion) {
|
||||||
|
darwinMinVersion = version;
|
||||||
|
};
|
||||||
|
|
||||||
|
stdenv' = if swiftSupport && stdenv.isDarwin && stdenv.isx86_64
|
||||||
|
then stdenv.override (old: {
|
||||||
|
buildPlatform = overrideSDK old.buildPlatform "10.15";
|
||||||
|
hostPlatform = overrideSDK old.hostPlatform "10.15";
|
||||||
|
targetPlatform = overrideSDK old.targetPlatform "10.15";
|
||||||
|
})
|
||||||
|
else stdenv;
|
||||||
|
in stdenv'.mkDerivation (finalAttrs: {
|
||||||
pname = "mpv";
|
pname = "mpv";
|
||||||
version = "0.35.1";
|
version = "0.35.1";
|
||||||
|
|
||||||
|
@ -33601,6 +33601,7 @@ with pkgs;
|
|||||||
} // (config.mplayer or {}));
|
} // (config.mplayer or {}));
|
||||||
|
|
||||||
mpv-unwrapped = darwin.apple_sdk_11_0.callPackage ../applications/video/mpv {
|
mpv-unwrapped = darwin.apple_sdk_11_0.callPackage ../applications/video/mpv {
|
||||||
|
stdenv = if stdenv.isDarwin then swiftPackages.stdenv else stdenv;
|
||||||
inherit lua;
|
inherit lua;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user