alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #44368 from Enzime/fix/latest-mpv-on-macos

Browse source 
mpv: Fix mpv 0.29.0 on macOS and disable OpenAL
This commit is contained in:
Jörg Thalheim 2018-08-03 08:43:34 +01:00 committed by GitHub
parent f64c01fa79 69ed31a57b
commit 2be0d9cc9b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
pkgs/applications/video/mpv/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchFromGitHub, makeWrapper { stdenv, fetchpatch, fetchurl, fetchFromGitHub, makeWrapper
, docutils, perl, pkgconfig, python3, which, ffmpeg_4 , docutils, perl, pkgconfig, python3, which, ffmpeg_4
, freefont_ttf, freetype, libass, libpthreadstubs , freefont_ttf, freetype, libass, libpthreadstubs
, lua, luasocket, libuchardet, libiconv ? null, darwin , lua, luasocket, libuchardet, libiconv ? null, darwin
@ -35,7 +35,7 @@
, youtubeSupport ? true, youtube-dl ? null , youtubeSupport ? true, youtube-dl ? null
, vaapiSupport ? true, libva ? null , vaapiSupport ? true, libva ? null
, drmSupport ? true, libdrm ? null , drmSupport ? true, libdrm ? null
, openalSupport ? true, openalSoft ? null , openalSupport ? false, openalSoft ? null
, vapoursynthSupport ? false, vapoursynth ? null , vapoursynthSupport ? false, vapoursynth ? null
, archiveSupport ? false, libarchive ? null , archiveSupport ? false, libarchive ? null
, jackaudioSupport ? false, libjack2 ? null , jackaudioSupport ? false, libjack2 ? null
@ -93,6 +93,13 @@ in stdenv.mkDerivation rec {
sha256 = "0i2nl65diqsjyz28dj07h6d8gq6ix72ysfm0nhs8514hqccaihs3"; sha256 = "0i2nl65diqsjyz28dj07h6d8gq6ix72ysfm0nhs8514hqccaihs3";
}; };
# FIXME: Remove this patch for building on macOS if it gets released in
# the future.
patches = optional stdenv.isDarwin (fetchpatch {
url = https://github.com/mpv-player/mpv/commit/dc553c8cf4349b2ab5d2a373ad2fac8bdd229ebb.patch;
sha256 = "0pa8vlb8rsxvd1s39c4iv7gbaqlkn3hx21a6xnpij99jdjkw3pg8";
});
postPatch = '' postPatch = ''
patchShebangs ./TOOLS/ patchShebangs ./TOOLS/
''; '';
@ -107,6 +114,7 @@ in stdenv.mkDerivation rec {
"--disable-libmpv-static" "--disable-libmpv-static"
"--disable-static-build" "--disable-static-build"
"--disable-build-date" # Purity "--disable-build-date" # Purity
"--disable-macos-cocoa-cb" # Disable whilst Swift isn't supported
(enableFeature archiveSupport "libarchive") (enableFeature archiveSupport "libarchive")
(enableFeature dvdreadSupport "dvdread") (enableFeature dvdreadSupport "dvdread")
(enableFeature dvdnavSupport "dvdnav") (enableFeature dvdnavSupport "dvdnav")
@ -143,7 +151,6 @@ in stdenv.mkDerivation rec {
++ optional speexSupport speex ++ optional speexSupport speex
++ optional bs2bSupport libbs2b ++ optional bs2bSupport libbs2b
++ optional openalSupport openalSoft ++ optional openalSupport openalSoft
++ optional (openalSupport && stdenv.isDarwin) darwin.apple_sdk.frameworks.OpenAL
++ optional libpngSupport libpng ++ optional libpngSupport libpng
++ optional youtubeSupport youtube-dl ++ optional youtubeSupport youtube-dl
++ optional sdl2Support SDL2 ++ optional sdl2Support SDL2
@ -152,11 +159,12 @@ in stdenv.mkDerivation rec {
++ optional drmSupport libdrm ++ optional drmSupport libdrm
++ optional vapoursynthSupport vapoursynth ++ optional vapoursynthSupport vapoursynth
++ optional archiveSupport libarchive ++ optional archiveSupport libarchive
++ optional stdenv.isDarwin libiconv
++ optionals dvdnavSupport [ libdvdnav libdvdnav.libdvdread ] ++ optionals dvdnavSupport [ libdvdnav libdvdnav.libdvdread ]
++ optionals x11Support [ libX11 libXext libGLU_combined libXxf86vm libXrandr ] ++ optionals x11Support [ libX11 libXext libGLU_combined libXxf86vm libXrandr ]
++ optionals waylandSupport [ wayland wayland-protocols libxkbcommon ] ++ optionals waylandSupport [ wayland wayland-protocols libxkbcommon ]
++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
CoreFoundation libiconv Cocoa CoreAudio CoreFoundation Cocoa CoreAudio
]); ]);
enableParallelBuilding = true; enableParallelBuilding = true;