tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
minitube: unbreak the build
Ingo Blechschmidt
3 years ago
ec8e3c7d
6fe448ff
+23
-1
2 changed files
expand all
collapse all
unified
split
pkgs
applications
video
minitube
default.nix
lib_media_src_mpv_mpvwidget.patch
+7
-1
pkgs/applications/video/minitube/default.nix
···
1
1
-
{ mkDerivation, lib, fetchFromGitHub, phonon, phonon-backend-vlc, qtbase, qmake
1
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
18
+
19
19
+
patches = [
20
20
+
# Taken from FreeBSD; already merged upstream in the media submodule
21
21
+
# (https://github.com/flaviotordini/media/commit/f6b7020f273e1fc06e6e204fab37a7c8edaa857a)
22
22
+
./lib_media_src_mpv_mpvwidget.patch
23
23
+
];
18
24
19
25
nativeBuildInputs = [ qmake qttools ];
20
26
+16
pkgs/applications/video/minitube/lib_media_src_mpv_mpvwidget.patch
···
1
1
+
diff -Nur a/lib/media/src/mpv/mpvwidget.cpp b/lib/media/src/mpv/mpvwidget.cpp
2
2
+
--- a/lib/media/src/mpv/mpvwidget.cpp
3
3
+
+++ b/lib/media/src/mpv/mpvwidget.cpp
4
4
+
@@ -30,7 +30,11 @@
5
5
+
qDebug() << "initializeGL" << nativeParent;
6
6
+
if (nativeParent == nullptr) qFatal("No native parent");
7
7
+
8
8
+
- mpv_opengl_init_params gl_init_params{get_proc_address, this, nullptr};
9
9
+
+ #if MPV_CLIENT_API_VERSION < MPV_MAKE_VERSION(2,0)
10
10
+
+ mpv_opengl_init_params gl_init_params{get_proc_address, this, nullptr};
11
11
+
+ #else
12
12
+
+ mpv_opengl_init_params gl_init_params{get_proc_address, this};
13
13
+
+ #endif
14
14
+
mpv_render_param params[]{{MPV_RENDER_PARAM_API_TYPE, (void *)MPV_RENDER_API_TYPE_OPENGL},
15
15
+
{MPV_RENDER_PARAM_OPENGL_INIT_PARAMS, &gl_init_params},
16
16
+
{MPV_RENDER_PARAM_INVALID, nullptr},