diff options
| author | Ingo Blechschmidt <iblech@speicherleck.de> | 2022-11-23 22:35:56 +0100 |
|---|---|---|
| committer | Ingo Blechschmidt <iblech@speicherleck.de> | 2022-11-24 20:08:50 +0100 |
| commit | ec8e3c7dec15c1c9007380a29c181e06c3cb8e2b (patch) | |
| tree | 61bf386df2fd6259b98bff737b0b9450d40a57fa /pkgs/applications/video/minitube | |
| parent | 6fe448ff9826060fe8cad3d10e30214ee6bfae8b (diff) | |
minitube: unbreak the build
Diffstat (limited to 'pkgs/applications/video/minitube')
| -rw-r--r-- | pkgs/applications/video/minitube/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/applications/video/minitube/lib_media_src_mpv_mpvwidget.patch | 16 |
2 files changed, 23 insertions, 1 deletions
diff --git a/pkgs/applications/video/minitube/default.nix b/pkgs/applications/video/minitube/default.nix index eda58349bd861..06bed9211318f 100644 --- a/pkgs/applications/video/minitube/default.nix +++ b/pkgs/applications/video/minitube/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitHub, phonon, phonon-backend-vlc, qtbase, qmake +{ mkDerivation, lib, fetchFromGitHub, fetchpatch, phonon, phonon-backend-vlc, qtbase, qmake , qtdeclarative, qttools, qtx11extras, mpv # "Free" key generated by pasqui23 @@ -16,6 +16,12 @@ mkDerivation rec { fetchSubmodules = true; }; + patches = [ + # Taken from FreeBSD; already merged upstream in the media submodule + # (https://github.com/flaviotordini/media/commit/f6b7020f273e1fc06e6e204fab37a7c8edaa857a) + ./lib_media_src_mpv_mpvwidget.patch + ]; + nativeBuildInputs = [ qmake qttools ]; buildInputs = [ phonon phonon-backend-vlc qtbase qtdeclarative qtx11extras mpv ]; diff --git a/pkgs/applications/video/minitube/lib_media_src_mpv_mpvwidget.patch b/pkgs/applications/video/minitube/lib_media_src_mpv_mpvwidget.patch new file mode 100644 index 0000000000000..9beff68a0ec40 --- /dev/null +++ b/pkgs/applications/video/minitube/lib_media_src_mpv_mpvwidget.patch @@ -0,0 +1,16 @@ +diff -Nur a/lib/media/src/mpv/mpvwidget.cpp b/lib/media/src/mpv/mpvwidget.cpp +--- a/lib/media/src/mpv/mpvwidget.cpp ++++ b/lib/media/src/mpv/mpvwidget.cpp +@@ -30,7 +30,11 @@ + qDebug() << "initializeGL" << nativeParent; + if (nativeParent == nullptr) qFatal("No native parent"); + +- mpv_opengl_init_params gl_init_params{get_proc_address, this, nullptr}; ++ #if MPV_CLIENT_API_VERSION < MPV_MAKE_VERSION(2,0) ++ mpv_opengl_init_params gl_init_params{get_proc_address, this, nullptr}; ++ #else ++ mpv_opengl_init_params gl_init_params{get_proc_address, this}; ++ #endif + mpv_render_param params[]{{MPV_RENDER_PARAM_API_TYPE, (void *)MPV_RENDER_API_TYPE_OPENGL}, + {MPV_RENDER_PARAM_OPENGL_INIT_PARAMS, &gl_init_params}, + {MPV_RENDER_PARAM_INVALID, nullptr}, |