From 1afa6d89ad924ec214aa7c70a2c3fcb7f5883464 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 25 Aug 2024 15:38:26 +0200 Subject: [PATCH] obs-studio-plugins.obs-tuna: 1.9.7 -> 1.9.9 --- .../obs-studio/plugins/obs-tuna/default.nix | 30 ++----------------- 1 file changed, 2 insertions(+), 28 deletions(-) diff --git a/pkgs/applications/video/obs-studio/plugins/obs-tuna/default.nix b/pkgs/applications/video/obs-studio/plugins/obs-tuna/default.nix index 798b23b2c8d7..767266be7665 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-tuna/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-tuna/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch2 , obs-studio , cmake , zlib @@ -15,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "obs-tuna"; - version = "1.9.7"; + version = "1.9.9"; nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; buildInputs = [ obs-studio qtbase zlib curl taglib dbus ]; @@ -24,35 +23,10 @@ stdenv.mkDerivation (finalAttrs: { owner = "univrsal"; repo = "tuna"; rev = "v${finalAttrs.version}"; - hash = "sha256-NpfQ3zi+1kQNt2Lj4+1kX2bW9A/E2/MhUV1BA1UX4y0="; + hash = "sha256-qwOAidnCGZSwTahgbyf1K0KgoDvYpqDAQXM3l1lfZXg="; fetchSubmodules = true; }; - # obs_frontend_add_dock() deprecated in obs 30 - env.NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; - - patches = [ - # fix build with qt 6.6.0 - # treewide: replace deprecated qAsConst with std::as_const() - # https://github.com/univrsal/tuna/pull/176 - (fetchpatch2 { - url = "https://github.com/univrsal/tuna/commit/0d570e771f8d8e6ae7c85bd2b86bbf59c264789e.patch"; - hash = "sha256-A5idhMiM9funqhTm5XMIBqwy+FO1SaNPtgZjo+Vws6k="; - }) - # fix build with obs 30 - (fetchpatch2 { - url = "https://github.com/univrsal/tuna/commit/723bd3c7b4e257cf0997611426e555068de77ae7.patch"; - hash = "sha256-MF5vghGYknL6q+A8BJ1yrQcEKIu9I+PWk+RZNYg3fRU="; - }) - ]; - - 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 = {