diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2018-09-23 03:04:04 +0200 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2018-09-24 09:34:05 +0200 |
| commit | e9faf00a904259640edb225ab6558acd564ff673 (patch) | |
| tree | 01007a8db81f8bb8839c32bf4e5a36efd166449d /pkgs | |
| parent | a9d0b83bd0b389c50b903982ae942f90ca3f66a1 (diff) | |
| download | nixlib-e9faf00a904259640edb225ab6558acd564ff673.tar nixlib-e9faf00a904259640edb225ab6558acd564ff673.tar.gz nixlib-e9faf00a904259640edb225ab6558acd564ff673.tar.bz2 nixlib-e9faf00a904259640edb225ab6558acd564ff673.tar.lz nixlib-e9faf00a904259640edb225ab6558acd564ff673.tar.xz nixlib-e9faf00a904259640edb225ab6558acd564ff673.tar.zst nixlib-e9faf00a904259640edb225ab6558acd564ff673.zip | |
obs-studio: 21.1.2 -> 22.0.2
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/video/obs-studio/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/applications/video/obs-studio/find-xcb.patch | 31 |
2 files changed, 4 insertions, 35 deletions
diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index a07a15177d04..cacad5a3e629 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -18,6 +18,7 @@ , makeWrapper , pkgconfig , vlc +, mbedtls , alsaSupport ? false , alsaLib @@ -29,17 +30,15 @@ let optional = stdenv.lib.optional; in stdenv.mkDerivation rec { name = "obs-studio-${version}"; - version = "21.1.2"; + version = "22.0.2"; src = fetchFromGitHub { owner = "jp9000"; repo = "obs-studio"; rev = "${version}"; - sha256 = "1gl6qibvckczk3yl44h3yshml6sn3izwn58qpxils5837rpkwlc5"; + sha256 = "1bgp2lirpsbp54vvl3p345njlpgv0d78vac2aqwbl34wqx5sqdk0"; }; - patches = [ ./find-xcb.patch ]; - nativeBuildInputs = [ cmake pkgconfig ]; @@ -59,6 +58,7 @@ in stdenv.mkDerivation rec { x264 vlc makeWrapper + mbedtls ] ++ optional alsaSupport alsaLib ++ optional pulseaudioSupport libpulseaudio; diff --git a/pkgs/applications/video/obs-studio/find-xcb.patch b/pkgs/applications/video/obs-studio/find-xcb.patch deleted file mode 100644 index c45aba4ce2f0..000000000000 --- a/pkgs/applications/video/obs-studio/find-xcb.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/libobs/CMakeLists.txt b/libobs/CMakeLists.txt -index cd2b80e1..7d829cdb 100644 ---- a/libobs/CMakeLists.txt -+++ b/libobs/CMakeLists.txt -@@ -15,6 +15,7 @@ if(UNIX) - find_package(DBus QUIET) - if (NOT APPLE) - find_package(X11_XCB REQUIRED) -+ find_package(XCB REQUIRED) - endif() - else() - set(HAVE_DBUS "0") -@@ -161,12 +162,15 @@ elseif(UNIX) - endif() - - include_directories( -- ${X11_XCB_INCLUDE_DIRS}) -+ ${X11_XCB_INCLUDE_DIRS} -+ ${XCB_INCLUDE_DIRS}) - add_definitions( -- ${X11_XCB_DEFINITIONS}) -+ ${X11_XCB_DEFINITIONS} -+ ${XCB_DEFINITIONS}) - set(libobs_PLATFORM_DEPS - ${libobs_PLATFORM_DEPS} -- ${X11_XCB_LIBRARIES}) -+ ${X11_XCB_LIBRARIES} -+ ${XCB_LIBRARIES}) - - if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") - # use the sysinfo compatibility library on bsd |