obs-studio: cherry-pick a bunch of build fixes, remove extremely misleadingly named argument
This commit is contained in:
@@ -2,10 +2,11 @@
|
|||||||
, lib
|
, lib
|
||||||
, stdenv
|
, stdenv
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
|
, fetchpatch
|
||||||
, addOpenGLRunpath
|
, addOpenGLRunpath
|
||||||
, cmake
|
, cmake
|
||||||
, fdk_aac
|
, fdk_aac
|
||||||
, ffmpeg_4
|
, ffmpeg
|
||||||
, jansson
|
, jansson
|
||||||
, libjack2
|
, libjack2
|
||||||
, libxkbcommon
|
, libxkbcommon
|
||||||
@@ -70,6 +71,29 @@ stdenv.mkDerivation rec {
|
|||||||
# Lets obs-browser build against CEF 90.1.0+
|
# Lets obs-browser build against CEF 90.1.0+
|
||||||
./Enable-file-access-and-universal-access-for-file-URL.patch
|
./Enable-file-access-and-universal-access-for-file-URL.patch
|
||||||
./fix-nix-plugin-path.patch
|
./fix-nix-plugin-path.patch
|
||||||
|
|
||||||
|
# Backport ffmpeg 6.1 / GCC 13 build fixes
|
||||||
|
# FIXME: remove in next release
|
||||||
|
(fetchpatch {
|
||||||
|
url = "https://github.com/obsproject/obs-studio/commit/cd784644f5e82b9988043f229c19603289c6d32c.patch";
|
||||||
|
hash = "sha256-S4JE5kgr4x3uMHY2GRh0GBJpb7o/wYZb/v0CDITFNnQ=";
|
||||||
|
})
|
||||||
|
(fetchpatch {
|
||||||
|
url = "https://github.com/obsproject/obs-studio/commit/758b47d4ed9a25b8d64ad481d8d039990b9e57c9.patch";
|
||||||
|
hash = "sha256-jYpjwhx6e+dhN3kzbd6FcdjQ+WhIX0/BOu9PSkt+2yI=";
|
||||||
|
})
|
||||||
|
(fetchpatch {
|
||||||
|
url = "https://github.com/obsproject/obs-studio/commit/4b5be75c7e4b8cee908ed4a02fe0078285b4e8c9.patch";
|
||||||
|
hash = "sha256-tuOevhyxchwG42ilrplbiWoiDAKaY4HgzShlvp4VSQI=";
|
||||||
|
})
|
||||||
|
(fetchpatch {
|
||||||
|
url = "https://github.com/obsproject/obs-studio/commit/6e080a68067b27fe5463f0f4eee7df690451f3d7.patch";
|
||||||
|
hash = "sha256-nbn/q3uszoHaDvaW8Et1MS1sgQzMsJRmjGSMHzUxV70=";
|
||||||
|
})
|
||||||
|
(fetchpatch {
|
||||||
|
url = "https://github.com/obsproject/obs-studio/commit/df70743385965f979f922e05af9a249f20f94869.patch";
|
||||||
|
hash = "sha256-uIBsFuggz8SgQsQ0Ry2lvSPeMm63lgVe7oFx/3aT12k=";
|
||||||
|
})
|
||||||
];
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
@@ -84,7 +108,7 @@ stdenv.mkDerivation rec {
|
|||||||
buildInputs = [
|
buildInputs = [
|
||||||
curl
|
curl
|
||||||
fdk_aac
|
fdk_aac
|
||||||
ffmpeg_4
|
ffmpeg
|
||||||
jansson
|
jansson
|
||||||
libcef
|
libcef
|
||||||
libjack2
|
libjack2
|
||||||
|
|||||||
@@ -34385,7 +34385,7 @@ with pkgs;
|
|||||||
obs-cli = callPackage ../applications/misc/obs-cli { };
|
obs-cli = callPackage ../applications/misc/obs-cli { };
|
||||||
|
|
||||||
obs-studio = qt6Packages.callPackage ../applications/video/obs-studio {
|
obs-studio = qt6Packages.callPackage ../applications/video/obs-studio {
|
||||||
ffmpeg_4 = ffmpeg-full;
|
ffmpeg = ffmpeg-full;
|
||||||
};
|
};
|
||||||
|
|
||||||
obs-studio-plugins = recurseIntoAttrs (callPackage ../applications/video/obs-studio/plugins {});
|
obs-studio-plugins = recurseIntoAttrs (callPackage ../applications/video/obs-studio/plugins {});
|
||||||
|
|||||||
Reference in New Issue
Block a user