diff options
| author | Vladimír Čunát <v@cunat.cz> | 2023-06-21 07:47:54 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2023-06-21 07:47:54 +0200 |
| commit | 5fbeff5330b74211a69d9e959173ab50b03a7e3f (patch) | |
| tree | 007ad73913bd561b78cea382d6d5284104197d20 | |
| parent | handbrake: fixup build (diff) | |
| download | nixpkgs-5fbeff5330b74211a69d9e959173ab50b03a7e3f.tar.gz | |
jami: fixup build of the custom ffmpeg
Same issue as addressed in the parent commit, apparently.
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/jami/default.nix | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/applications/networking/instant-messengers/jami/default.nix b/pkgs/applications/networking/instant-messengers/jami/default.nix index a2d53141f413..ca4e8d5c3c80 100644 --- a/pkgs/applications/networking/instant-messengers/jami/default.nix +++ b/pkgs/applications/networking/instant-messengers/jami/default.nix @@ -3,6 +3,7 @@ , callPackage , fetchFromGitHub , fetchzip +, fetchpatch , ffmpeg , pjsip , opendht @@ -50,7 +51,12 @@ rec { patch-src = src + "/daemon/contrib/src/ffmpeg/"; in { - patches = old.patches ++ (map (x: patch-src + x) (readLinesToList ./config/ffmpeg_patches)); + patches = old.patches ++ [ + (fetchpatch { + url = "https://git.videolan.org/?p=ffmpeg.git;a=patch;h=e5163b1d34381a3319214a902ef1df923dd2eeba"; + hash = "sha256-nLhP2+34cj5EgpnUrePZp60nYAxmbhZAEDfay4pBVk0="; + }) + ] ++ map (x: patch-src + x) (readLinesToList ./config/ffmpeg_patches); configureFlags = old.configureFlags ++ (readLinesToList ./config/ffmpeg_args_common) ++ lib.optionals stdenv.isLinux (readLinesToList ./config/ffmpeg_args_linux) |