diff options
| author | Nick Cao <nickcao@nichi.co> | 2023-10-13 00:39:56 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-13 00:39:56 -0400 |
| commit | 9cbf22c3f42fc91e1cb744a275da414ffd3589af (patch) | |
| tree | dbd1f3b2dccff8611813e5ca069fd57ecb2716b9 /pkgs/applications/video | |
| parent | 7ba31c7a91e430e22bd1596f9b4dd277c543ed4e (diff) | |
| parent | 2de11a7688a9c5eec0b8413cb00e8307a7fea02c (diff) | |
| download | nixpkgs-9cbf22c3f42fc91e1cb744a275da414ffd3589af.tar nixpkgs-9cbf22c3f42fc91e1cb744a275da414ffd3589af.tar.gz nixpkgs-9cbf22c3f42fc91e1cb744a275da414ffd3589af.tar.bz2 nixpkgs-9cbf22c3f42fc91e1cb744a275da414ffd3589af.tar.lz nixpkgs-9cbf22c3f42fc91e1cb744a275da414ffd3589af.tar.xz nixpkgs-9cbf22c3f42fc91e1cb744a275da414ffd3589af.tar.zst nixpkgs-9cbf22c3f42fc91e1cb744a275da414ffd3589af.zip | |
Merge pull request #260239 from NickCao/qt6
qt6: 6.5.3 -> 6.6.0
Diffstat (limited to 'pkgs/applications/video')
| -rw-r--r-- | pkgs/applications/video/obs-studio/plugins/obs-tuna/default.nix | 11 |
1 files changed, 11 insertions, 0 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 7cfa5088154..8fd1b5f96f8 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-tuna/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-tuna/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch2 , obs-studio , cmake , zlib @@ -27,6 +28,16 @@ stdenv.mkDerivation (finalAttrs: { fetchSubmodules = true; }; + 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="; + }) + ]; + postInstall = '' mkdir $out/lib $out/share mv $out/obs-plugins/64bit $out/lib/obs-plugins |