diff options
author | Sandro <sandro.jaeckel@gmail.com> | 2021-06-02 10:15:24 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-06-02 10:15:24 +0200 |
commit | a9c61f2c67a4a45a12cf9baf0ce33df3aa5c2078 (patch) | |
tree | 933f19fc5070bfc25eec19fec74b3e32dcfe7efa | |
parent | b5f2aa78c79fbd93be2072b53997215c66425229 (diff) | |
parent | 9e3118de6b335a7396f26dba2551d2258e849fb4 (diff) | |
download | nixpkgs-a9c61f2c67a4a45a12cf9baf0ce33df3aa5c2078.tar nixpkgs-a9c61f2c67a4a45a12cf9baf0ce33df3aa5c2078.tar.gz nixpkgs-a9c61f2c67a4a45a12cf9baf0ce33df3aa5c2078.tar.bz2 nixpkgs-a9c61f2c67a4a45a12cf9baf0ce33df3aa5c2078.tar.lz nixpkgs-a9c61f2c67a4a45a12cf9baf0ce33df3aa5c2078.tar.xz nixpkgs-a9c61f2c67a4a45a12cf9baf0ce33df3aa5c2078.tar.zst nixpkgs-a9c61f2c67a4a45a12cf9baf0ce33df3aa5c2078.zip |
Merge pull request #119057 from erdnaxe/obs-websocket
-rw-r--r-- | maintainers/maintainer-list.nix | 10 | ||||
-rw-r--r-- | pkgs/applications/video/obs-studio/plugins/obs-websocket.nix | 39 |
2 files changed, 49 insertions, 0 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 9dad34342d3..69b94bd7d00 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3031,6 +3031,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"; 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" ]; + }; +} |