diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-01-23 06:00:55 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-23 06:00:55 +0000 |
| commit | 70e275b1cb84a97f1ccc913a8711e1b11f93646f (patch) | |
| tree | 1a659ce138e1d303486a09a3340d4e192be2c7a4 /pkgs/applications/video | |
| parent | 8303a96c2d9a94ef0a3b48ea2782da438d3035c9 (diff) | |
| parent | 9dbf5074dba2c3c43cc9faa065c85acf1a246b64 (diff) | |
| download | nixlib-70e275b1cb84a97f1ccc913a8711e1b11f93646f.tar nixlib-70e275b1cb84a97f1ccc913a8711e1b11f93646f.tar.gz nixlib-70e275b1cb84a97f1ccc913a8711e1b11f93646f.tar.bz2 nixlib-70e275b1cb84a97f1ccc913a8711e1b11f93646f.tar.lz nixlib-70e275b1cb84a97f1ccc913a8711e1b11f93646f.tar.xz nixlib-70e275b1cb84a97f1ccc913a8711e1b11f93646f.tar.zst nixlib-70e275b1cb84a97f1ccc913a8711e1b11f93646f.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/video')
| -rw-r--r-- | pkgs/applications/video/obs-studio/default.nix | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index 74b19296dbdf..29bb90a9dd8d 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -94,6 +94,14 @@ stdenv.mkDerivation (finalAttrs: { url = "https://github.com/obsproject/obs-studio/commit/6e080a68067b27fe5463f0f4eee7df690451f3d7.patch"; hash = "sha256-nbn/q3uszoHaDvaW8Et1MS1sgQzMsJRmjGSMHzUxV70="; }) + + # Fix libobs.pc for plugins on non-x86 systems + (fetchpatch { + name = "fix-arm64-cmake.patch"; + url = "https://git.alpinelinux.org/aports/plain/community/obs-studio/broken-config.patch?id=a92887564dcc65e07b6be8a6224fda730259ae2b"; + hash = "sha256-yRSw4VWDwMwysDB3Hw/tsmTjEQUhipvrVRQcZkbtuoI="; + includes = [ "*/CompilerConfig.cmake" ]; + }) ]; nativeBuildInputs = [ |