From 07eeb1f1a2db1b0253faab1925a806c86ecc3d64 Mon Sep 17 00:00:00 2001 From: emaryn Date: Sat, 22 Feb 2025 22:59:23 +0800 Subject: [PATCH 1/2] obs-studio-plugins.obs-scale-to-sound: refactor --- .../video/obs-studio/plugins/obs-scale-to-sound.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/video/obs-studio/plugins/obs-scale-to-sound.nix b/pkgs/applications/video/obs-studio/plugins/obs-scale-to-sound.nix index 3b3f9c6e8220..20480b59c210 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-scale-to-sound.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-scale-to-sound.nix @@ -13,11 +13,12 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "dimtpap"; repo = "obs-scale-to-sound"; - rev = version; - sha256 = "sha256-q/zNHPazNwmd7GHXrxNgajtOhcW+oTgH9rkIBzJpdpA="; + tag = version; + hash = "sha256-q/zNHPazNwmd7GHXrxNgajtOhcW+oTgH9rkIBzJpdpA="; }; nativeBuildInputs = [ cmake ]; + buildInputs = [ obs-studio ]; cmakeFlags = [ @@ -25,17 +26,17 @@ stdenv.mkDerivation rec { ]; postInstall = '' - mkdir $out/lib $out/share + mkdir -p $out/lib $out/share mv $out/obs-plugins/64bit $out/lib/obs-plugins rm -rf $out/obs-plugins mv $out/data $out/share/obs ''; - meta = with lib; { + meta = { description = "OBS filter plugin that scales a source reactively to sound levels"; homepage = "https://github.com/dimtpap/obs-scale-to-sound"; - maintainers = with maintainers; [ flexiondotorg ]; - license = licenses.gpl2Plus; + maintainers = with lib.maintainers; [ flexiondotorg ]; + license = lib.licenses.gpl2Plus; platforms = [ "x86_64-linux" "i686-linux" From 989f44dd31ee6e33e57847354e01233a5f306f55 Mon Sep 17 00:00:00 2001 From: emaryn Date: Sat, 22 Feb 2025 23:07:44 +0800 Subject: [PATCH 2/2] obs-studio-plugins.obs-scale-to-sound: 1.2.3 -> 1.2.4 --- .../video/obs-studio/plugins/obs-scale-to-sound.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/video/obs-studio/plugins/obs-scale-to-sound.nix b/pkgs/applications/video/obs-studio/plugins/obs-scale-to-sound.nix index 20480b59c210..1c65bff9b0f1 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-scale-to-sound.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-scale-to-sound.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "obs-scale-to-sound"; - version = "1.2.3"; + version = "1.2.4"; src = fetchFromGitHub { owner = "dimtpap"; repo = "obs-scale-to-sound"; tag = version; - hash = "sha256-q/zNHPazNwmd7GHXrxNgajtOhcW+oTgH9rkIBzJpdpA="; + hash = "sha256-N6OMufx4+WyLGnIZQNxwlPdlmsa+GoZhuDMS9NIbIGE="; }; nativeBuildInputs = [ cmake ]; @@ -25,13 +25,6 @@ stdenv.mkDerivation rec { "-DBUILD_OUT_OF_TREE=On" ]; - postInstall = '' - mkdir -p $out/lib $out/share - mv $out/obs-plugins/64bit $out/lib/obs-plugins - rm -rf $out/obs-plugins - mv $out/data $out/share/obs - ''; - meta = { description = "OBS filter plugin that scales a source reactively to sound levels"; homepage = "https://github.com/dimtpap/obs-scale-to-sound";