diff options
author | peelz <LouisTakePILLz@users.noreply.github.com> | 2020-04-21 10:59:49 -0400 |
---|---|---|
committer | peelz <LouisTakePILLz@users.noreply.github.com> | 2020-04-25 18:35:18 -0400 |
commit | a576482e4cbac5c02409a7864dc33750ad752cd0 (patch) | |
tree | bdfe094704f608bcd31202ac97cdf941a14b5d03 | |
parent | 9a66afc5d0620aff2f68a5608058f7972eea7ced (diff) | |
download | nixpkgs-a576482e4cbac5c02409a7864dc33750ad752cd0.tar nixpkgs-a576482e4cbac5c02409a7864dc33750ad752cd0.tar.gz nixpkgs-a576482e4cbac5c02409a7864dc33750ad752cd0.tar.bz2 nixpkgs-a576482e4cbac5c02409a7864dc33750ad752cd0.tar.lz nixpkgs-a576482e4cbac5c02409a7864dc33750ad752cd0.tar.xz nixpkgs-a576482e4cbac5c02409a7864dc33750ad752cd0.tar.zst nixpkgs-a576482e4cbac5c02409a7864dc33750ad752cd0.zip |
obs-v4l2sink: add 32-bit support
The rev was downgraded to the latest released version (0.1.0) because the the changes on master are mostly related to localization and README stuff. The only code-related change is insignificant.
-rw-r--r-- | pkgs/applications/video/obs-studio/0001-find-ObsPluginHelpers.cmake-in-the-obs-src.patch | 25 | ||||
-rw-r--r-- | pkgs/applications/video/obs-studio/v4l2sink.nix | 52 |
2 files changed, 28 insertions, 49 deletions
diff --git a/pkgs/applications/video/obs-studio/0001-find-ObsPluginHelpers.cmake-in-the-obs-src.patch b/pkgs/applications/video/obs-studio/0001-find-ObsPluginHelpers.cmake-in-the-obs-src.patch deleted file mode 100644 index b642fbc3ada..00000000000 --- a/pkgs/applications/video/obs-studio/0001-find-ObsPluginHelpers.cmake-in-the-obs-src.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 5798a2691467604e89fd9fb1cd5289ebd1b1d7b8 Mon Sep 17 00:00:00 2001 -From: Graham Christensen <graham@grahamc.com> -Date: Fri, 20 Mar 2020 22:32:02 -0400 -Subject: [PATCH] find ObsPluginHelpers.cmake in the obs src - ---- - external/FindLibObs.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/external/FindLibObs.cmake b/external/FindLibObs.cmake -index ab0a3de..53a46b8 100644 ---- a/external/FindLibObs.cmake -+++ b/external/FindLibObs.cmake -@@ -95,7 +95,7 @@ if(LIBOBS_FOUND) - - set(LIBOBS_INCLUDE_DIRS ${LIBOBS_INCLUDE_DIR} ${W32_PTHREADS_INCLUDE_DIR}) - set(LIBOBS_LIBRARIES ${LIBOBS_LIB} ${W32_PTHREADS_LIB}) -- include(${LIBOBS_INCLUDE_DIR}/../cmake/external/ObsPluginHelpers.cmake) -+ include(${OBS_SRC}/cmake/external/ObsPluginHelpers.cmake) - - # allows external plugins to easily use/share common dependencies that are often included with libobs (such as FFmpeg) - if(NOT DEFINED INCLUDED_LIBOBS_CMAKE_MODULES) --- -2.25.0 - diff --git a/pkgs/applications/video/obs-studio/v4l2sink.nix b/pkgs/applications/video/obs-studio/v4l2sink.nix index 1a1a48f11ed..515cc001ee9 100644 --- a/pkgs/applications/video/obs-studio/v4l2sink.nix +++ b/pkgs/applications/video/obs-studio/v4l2sink.nix @@ -1,42 +1,46 @@ -{ stdenv, fetchFromGitHub -, cmake, pkgconfig, wrapQtAppsHook -, obs-studio }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, qtbase +, obs-studio +}: -stdenv.mkDerivation { - pname = "obs-v4l2sink-unstable"; - version = "20181012"; +stdenv.mkDerivation rec { + pname = "obs-v4l2sink"; + version = "0.1.0"; src = fetchFromGitHub { owner = "CatxFish"; repo = "obs-v4l2sink"; - rev = "1ec3c8ada0e1040d867ce567f177be55cd278378"; - sha256 = "03ah91cm1qz26k90mfx51l0d598i9bcmw39lkikjs1msm4c9dfxx"; + rev = version; + sha256 = "0l4lavaywih5lzwgxcbnvdrxhpvkrmh56li06s3aryikngxwsk3z"; }; - nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ]; - buildInputs = [ obs-studio ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ qtbase obs-studio ]; - patches = [ - ./0001-find-ObsPluginHelpers.cmake-in-the-obs-src.patch + cmakeFlags = with lib; [ + "-DLIBOBS_INCLUDE_DIR=${obs-studio.src}/libobs" ]; - cmakeFlags = [ - "-DLIBOBS_INCLUDE_DIR=${obs-studio}/include/obs" - "-DLIBOBS_LIBRARIES=${obs-studio}/lib" - "-DCMAKE_CXX_FLAGS=-I${obs-studio.src}/UI/obs-frontend-api" - "-DOBS_SRC=${obs-studio.src}" - ]; - - installPhase = '' - mkdir -p $out/share/obs/obs-plugins/v4l2sink/bin/64bit - cp ./v4l2sink.so $out/share/obs/obs-plugins/v4l2sink/bin/64bit/ + # obs-studio expects the shared object to be located in bin/32bit or bin/64bit + # https://github.com/obsproject/obs-studio/blob/d60c736cb0ec0491013293c8a483d3a6573165cb/libobs/obs-nix.c#L48 + postInstall = let + pluginPath = { + i686-linux = "bin/32bit"; + x86_64-linux = "bin/64bit"; + }.${stdenv.targetPlatform.system} or (throw "Unsupported system: ${stdenv.targetPlatform.system}"); + in '' + mkdir -p $out/share/obs/obs-plugins/v4l2sink/${pluginPath} + ln -s $out/lib/obs-plugins/v4l2sink.so $out/share/obs/obs-plugins/v4l2sink/${pluginPath} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "obs studio output plugin for Video4Linux2 device"; homepage = "https://github.com/CatxFish/obs-v4l2sink"; maintainers = with maintainers; [ colemickens peelz ]; license = licenses.gpl2; - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" "i686-linux" ]; }; } |