From 7eedec57e8f6ce7baceb7086d5e2f24c9c6b414b Mon Sep 17 00:00:00 2001 From: Alexandre Iooss Date: Sat, 10 Apr 2021 18:46:13 +0200 Subject: [PATCH 1/2] maintainers: add erdnaxe --- maintainers/maintainer-list.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index e2bf9f5f49e..e2c00b8690d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2927,6 +2927,16 @@ githubId = 147284; name = "Jason Felice"; }; + erdnaxe = { + email = "erdnaxe@crans.org"; + github = "erdnaxe"; + githubId = 2663216; + name = "Alexandre Iooss"; + keys = [{ + longkeyid = "rsa4096/0x6C79278F3FCDCC02"; + fingerprint = "2D37 1AD2 7E2B BC77 97E1 B759 6C79 278F 3FCD CC02"; + }]; + }; ericbmerritt = { email = "eric@afiniate.com"; github = "ericbmerritt"; From 9e3118de6b335a7396f26dba2551d2258e849fb4 Mon Sep 17 00:00:00 2001 From: Alexandre Iooss Date: Sat, 10 Apr 2021 18:50:47 +0200 Subject: [PATCH 2/2] obs-websocket: init at 4.9.0 --- .../obs-studio/plugins/obs-websocket.nix | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 pkgs/applications/video/obs-studio/plugins/obs-websocket.nix diff --git a/pkgs/applications/video/obs-studio/plugins/obs-websocket.nix b/pkgs/applications/video/obs-studio/plugins/obs-websocket.nix new file mode 100644 index 00000000000..eb95353e8d6 --- /dev/null +++ b/pkgs/applications/video/obs-studio/plugins/obs-websocket.nix @@ -0,0 +1,39 @@ +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, cmake +, qtbase +, obs-studio +, asio_1_10 +, websocketpp +}: + +stdenv.mkDerivation rec { + pname = "obs-websocket"; + version = "4.9.0"; + + src = fetchFromGitHub { + owner = "Palakis"; + repo = "obs-websocket"; + rev = version; + sha256 = "1dxih5czcfs1vczbq48784jvmgs8awbsrwk8mdfi4pg8n577cr1w"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ qtbase obs-studio asio_1_10 websocketpp ]; + + dontWrapQtApps = true; + + cmakeFlags = [ + "-DLIBOBS_INCLUDE_DIR=${obs-studio.src}/libobs" + ]; + + meta = with lib; { + description = "Remote-control OBS Studio through WebSockets"; + homepage = "https://github.com/Palakis/obs-websocket"; + maintainers = with maintainers; [ erdnaxe ]; + license = licenses.gpl2Plus; + platforms = [ "x86_64-linux" "i686-linux" ]; + }; +}