diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-10-13 06:01:14 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-13 06:01:14 +0000 |
| commit | 8a68e0b5f5b066adcf26558a383580da64e71456 (patch) | |
| tree | 804a0586f75d9680b9c904f098600d89f144b16a /pkgs/applications/video | |
| parent | 58485aaddb4a6531ac7790bf3aefd7a9d22ae1a9 (diff) | |
| parent | 1d6eb597f322f82c84a8ccd8598a60a7322b4f1f (diff) | |
| download | nixpkgs-8a68e0b5f5b066adcf26558a383580da64e71456.tar nixpkgs-8a68e0b5f5b066adcf26558a383580da64e71456.tar.gz nixpkgs-8a68e0b5f5b066adcf26558a383580da64e71456.tar.bz2 nixpkgs-8a68e0b5f5b066adcf26558a383580da64e71456.tar.lz nixpkgs-8a68e0b5f5b066adcf26558a383580da64e71456.tar.xz nixpkgs-8a68e0b5f5b066adcf26558a383580da64e71456.tar.zst nixpkgs-8a68e0b5f5b066adcf26558a383580da64e71456.zip | |
Merge master into staging-next
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 |