From 34b396feef90b1930decab6ae08cb213d14a8100 Mon Sep 17 00:00:00 2001 From: Short Cord Date: Wed, 14 Jun 2023 17:03:52 -0400 Subject: [PATCH 1/2] maintainers: add shortcord --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index f040598e5d39..53f162af62ab 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -15009,6 +15009,12 @@ github = "kf5grd"; githubId = 18297490; }; + shortcord = { + name = "Short Cord"; + email = "short@shortcord.com"; + github = "shortcord"; + githubId = 3823744; + }; shou = { email = "x+g@shou.io"; github = "Shou"; From 35881fdd9de7c0a4c33c462ab2d4a6896546944a Mon Sep 17 00:00:00 2001 From: Short Cord Date: Wed, 14 Jun 2023 15:13:54 -0400 Subject: [PATCH 2/2] obs-tuna: init at 1.9.6 --- .../video/obs-studio/plugins/default.nix | 2 + .../obs-studio/plugins/obs-tuna/default.nix | 46 +++++++++++++++++++ 2 files changed, 48 insertions(+) create mode 100644 pkgs/applications/video/obs-studio/plugins/obs-tuna/default.nix diff --git a/pkgs/applications/video/obs-studio/plugins/default.nix b/pkgs/applications/video/obs-studio/plugins/default.nix index 2ca9d0f5cd54..bac94a8123ed 100644 --- a/pkgs/applications/video/obs-studio/plugins/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/default.nix @@ -58,6 +58,8 @@ obs-transition-table = qt6Packages.callPackage ./obs-transition-table.nix { }; + obs-tuna = qt6Packages.callPackage ./obs-tuna { }; + obs-vaapi = callPackage ./obs-vaapi { }; obs-vertical-canvas = qt6Packages.callPackage ./obs-vertical-canvas.nix { }; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-tuna/default.nix b/pkgs/applications/video/obs-studio/plugins/obs-tuna/default.nix new file mode 100644 index 000000000000..52ad130b034d --- /dev/null +++ b/pkgs/applications/video/obs-studio/plugins/obs-tuna/default.nix @@ -0,0 +1,46 @@ +{ lib +, stdenv +, fetchFromGitHub +, obs-studio +, cmake +, zlib +, curl +, taglib +, dbus +, pkg-config +, qtbase +, wrapQtAppsHook +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "obs-tuna"; + version = "1.9.6"; + + nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; + buildInputs = [ obs-studio qtbase zlib curl taglib dbus ]; + + src = fetchFromGitHub { + owner = "univrsal"; + repo = "tuna"; + rev = "v${finalAttrs.version}"; + hash = "sha256-+AgRaivvYhogX4CLGK2ylvE8tQoauC/UMvXK6W0Tvog="; + fetchSubmodules = true; + }; + + postInstall = '' + mkdir $out/lib $out/share + mv $out/obs-plugins/64bit $out/lib/obs-plugins + rm -rf $out/obs-plugins + mv $out/data $out/share/obs + ''; + + dontWrapQtApps = true; + + meta = { + description = "Song information plugin for obs-studio"; + homepage = "https://github.com/univrsal/tuna"; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ shortcord ]; + platforms = lib.platforms.linux; + }; +})