diff options
author | K900 <me@0upti.me> | 2024-01-08 21:36:54 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-01-08 21:36:54 +0300 |
commit | fb8c15911e90f08ccef9777483e49af6dca32333 (patch) | |
tree | 7714d778f58712baa706ad51660f55343559edfe /pkgs/applications | |
parent | 6bf0bf35bb3fb134c6b233879dee90d3238a496b (diff) | |
parent | 5308573c13f2cf45b4ee8ec6a09742ad2adcd8b8 (diff) |
Merge pull request #279427 from K900/next-fixage
[staging-next] Pile of fixes, part 2
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/office/libreoffice/default.nix | 15 | ||||
-rw-r--r-- | pkgs/applications/video/obs-studio/default.nix | 28 |
2 files changed, 40 insertions, 3 deletions
diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 6be1d11ae3b68..e7fa0c53f7302 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -13,6 +13,7 @@ , IOCompress , zlib , libjpeg +, liblangtag , expat , freetype , libwpd @@ -225,6 +226,17 @@ in stdenv.mkDerivation (finalAttrs: { url = "https://cgit.freedesktop.org/libreoffice/core/patch/?id=ececb678b8362e3be8e02768ddd5e4197d87dc2a"; hash = "sha256-TUfKlwNxUTOJ95VLqwVD+ez1xhu7bW6xZlgIaCyIiNg="; }) + + # Backport libxml 2.12 build fixes + # FIXME: remove in next release + (fetchpatch { + url = "https://cgit.freedesktop.org/libreoffice/core/patch/?id=c8f7408db73d2f2ccacb25a2b4fef8dfebdfc6cb"; + hash = "sha256-uEgRx1eyS3Wx2ZDWEsUmpIbuKezVrIbO++qSL2QI8Lk="; + }) + (fetchpatch { + url = "https://cgit.freedesktop.org/libreoffice/core/patch/?id=cbb17a548b5cc6a99b6ed7735479bb4f2bc40f26"; + hash = "sha256-ofhif37uvQI+gidaUpyr6XlyBc3gTJUDBRb3ootrzz0="; + }) ]; # libreoffice tries to reference the BUILDCONFIG (e.g. PKG_CONFIG_PATH) @@ -436,6 +448,7 @@ in stdenv.mkDerivation (finalAttrs: { "--with-system-headers" "--with-system-openssl" "--with-system-libabw" + "--with-system-liblangtag" "--without-system-libcmis" "--with-system-libwps" "--with-system-openldap" @@ -466,7 +479,6 @@ in stdenv.mkDerivation (finalAttrs: { "--without-system-lpsolve" "--without-system-libetonyek" "--without-system-libfreehand" - "--without-system-liblangtag" "--without-system-libmspub" "--without-system-libnumbertext" "--without-system-libpagemaker" @@ -566,6 +578,7 @@ in stdenv.mkDerivation (finalAttrs: { libepoxy libexttextcat libjpeg + liblangtag libmspack libmwaw libmysqlclient diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index a19e996064a0c..c6183f5148990 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -2,10 +2,11 @@ , lib , stdenv , fetchFromGitHub +, fetchpatch , addOpenGLRunpath , cmake , fdk_aac -, ffmpeg_4 +, ffmpeg , jansson , libjack2 , libxkbcommon @@ -70,6 +71,29 @@ stdenv.mkDerivation rec { # Lets obs-browser build against CEF 90.1.0+ ./Enable-file-access-and-universal-access-for-file-URL.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 = [ @@ -84,7 +108,7 @@ stdenv.mkDerivation rec { buildInputs = [ curl fdk_aac - ffmpeg_4 + ffmpeg jansson libcef libjack2 |