pyrox.dev
obs-studio: 18.0.1 -> 18.0.2
add myself as a maintainer for this package, add fdk_aac, pthreadstubs,
and Xdmcp as dependencies. Also add a patch to fix a linker error
involving xcb
+14
-4
pkgs/applications/video/obs-studio/default.nix
+14
-4
pkgs/applications/video/obs-studio/default.nix
···
1
1
{ stdenv
2
2
, fetchFromGitHub
3
3
, cmake
4
+
, fdk_aac
4
5
, ffmpeg
5
6
, jansson
6
7
, libxkbcommon
8
+
, libpthreadstubs
9
+
, libXdmcp
7
10
, qtbase
8
11
, qtx11extras
9
12
, libv4l
···
11
14
, curl
12
15
, xorg
13
16
, makeWrapper
17
+
, pkgconfig
14
18
15
19
, alsaSupport ? false
16
20
, alsaLib
···
22
26
optional = stdenv.lib.optional;
23
27
in stdenv.mkDerivation rec {
24
28
name = "obs-studio-${version}";
25
-
version = "18.0.1";
29
+
version = "18.0.2";
26
30
27
31
src = fetchFromGitHub {
28
32
owner = "jp9000";
29
33
repo = "obs-studio";
30
-
rev = "624aa2a5";
31
-
sha256 = "1bs82rqyq7wjjg99mh23ap8z5bmrhjfnza5iyjx808fzqc0bgzaj";
34
+
rev = "26c28b45";
35
+
sha256 = "06rr70z2p2l8prxmd075pnlc759ddlqn3jprn8ns148x6s2vqik2";
32
36
};
33
37
38
+
patches = [ ./find-xcb.patch ];
39
+
34
40
nativeBuildInputs = [ cmake
41
+
pkgconfig
35
42
];
36
43
37
44
buildInputs = [ curl
45
+
fdk_aac
38
46
ffmpeg
39
47
jansson
40
48
libv4l
41
49
libxkbcommon
50
+
libpthreadstubs
51
+
libXdmcp
42
52
qtbase
43
53
qtx11extras
44
54
x264
···
65
75
video content, efficiently
66
76
'';
67
77
homepage = "https://obsproject.com";
68
-
maintainers = with maintainers; [ jb55 ];
78
+
maintainers = with maintainers; [ jb55 MP2E ];
69
79
license = licenses.gpl2;
70
80
platforms = with platforms; linux;
71
81
};
+31
pkgs/applications/video/obs-studio/find-xcb.patch
+31
pkgs/applications/video/obs-studio/find-xcb.patch
···
1
+
diff --git a/libobs/CMakeLists.txt b/libobs/CMakeLists.txt
2
+
index cd2b80e1..7d829cdb 100644
3
+
--- a/libobs/CMakeLists.txt
4
+
+++ b/libobs/CMakeLists.txt
5
+
@@ -15,6 +15,7 @@ if(UNIX)
6
+
find_package(DBus QUIET)
7
+
if (NOT APPLE)
8
+
find_package(X11_XCB REQUIRED)
9
+
+ find_package(XCB REQUIRED)
10
+
endif()
11
+
else()
12
+
set(HAVE_DBUS "0")
13
+
@@ -161,12 +162,15 @@ elseif(UNIX)
14
+
endif()
15
+
16
+
include_directories(
17
+
- ${X11_XCB_INCLUDE_DIRS})
18
+
+ ${X11_XCB_INCLUDE_DIRS}
19
+
+ ${XCB_INCLUDE_DIRS})
20
+
add_definitions(
21
+
- ${X11_XCB_DEFINITIONS})
22
+
+ ${X11_XCB_DEFINITIONS}
23
+
+ ${XCB_DEFINITIONS})
24
+
set(libobs_PLATFORM_DEPS
25
+
${libobs_PLATFORM_DEPS}
26
+
- ${X11_XCB_LIBRARIES})
27
+
+ ${X11_XCB_LIBRARIES}
28
+
+ ${XCB_LIBRARIES})
29
+
30
+
if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
31
+
# use the sysinfo compatibility library on bsd