minitube: unbreak the build

+23 -1
+7 -1
pkgs/applications/video/minitube/default.nix
··· 1 - { mkDerivation, lib, fetchFromGitHub, phonon, phonon-backend-vlc, qtbase, qmake 1 + { mkDerivation, lib, fetchFromGitHub, fetchpatch, phonon, phonon-backend-vlc, qtbase, qmake 2 2 , qtdeclarative, qttools, qtx11extras, mpv 3 3 4 4 # "Free" key generated by pasqui23 ··· 15 15 owner = "flaviotordini"; 16 16 fetchSubmodules = true; 17 17 }; 18 + 19 + patches = [ 20 + # Taken from FreeBSD; already merged upstream in the media submodule 21 + # (https://github.com/flaviotordini/media/commit/f6b7020f273e1fc06e6e204fab37a7c8edaa857a) 22 + ./lib_media_src_mpv_mpvwidget.patch 23 + ]; 18 24 19 25 nativeBuildInputs = [ qmake qttools ]; 20 26
+16
pkgs/applications/video/minitube/lib_media_src_mpv_mpvwidget.patch
··· 1 + diff -Nur a/lib/media/src/mpv/mpvwidget.cpp b/lib/media/src/mpv/mpvwidget.cpp 2 + --- a/lib/media/src/mpv/mpvwidget.cpp 3 + +++ b/lib/media/src/mpv/mpvwidget.cpp 4 + @@ -30,7 +30,11 @@ 5 + qDebug() << "initializeGL" << nativeParent; 6 + if (nativeParent == nullptr) qFatal("No native parent"); 7 + 8 + - mpv_opengl_init_params gl_init_params{get_proc_address, this, nullptr}; 9 + + #if MPV_CLIENT_API_VERSION < MPV_MAKE_VERSION(2,0) 10 + + mpv_opengl_init_params gl_init_params{get_proc_address, this, nullptr}; 11 + + #else 12 + + mpv_opengl_init_params gl_init_params{get_proc_address, this}; 13 + + #endif 14 + mpv_render_param params[]{{MPV_RENDER_PARAM_API_TYPE, (void *)MPV_RENDER_API_TYPE_OPENGL}, 15 + {MPV_RENDER_PARAM_OPENGL_INIT_PARAMS, &gl_init_params}, 16 + {MPV_RENDER_PARAM_INVALID, nullptr},