diff options
| author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2023-07-30 03:54:16 +0200 |
|---|---|---|
| committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2023-07-30 03:54:27 +0200 |
| commit | 167f6dfee4d08ba092190b916afd103719456e86 (patch) | |
| tree | 714f44350d2c7b8767fd90cbac4cd3ee95fed3b0 /pkgs/applications/networking/instant-messengers | |
| parent | 8a0886a3459fbbec66e5e1b2c789d65ac0f64bed (diff) | |
| parent | acedeab23694d2b7fdcffe0dff52f98838cb23ae (diff) | |
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts: - pkgs/development/libraries/science/astronomy/cfitsio/default.nix
Diffstat (limited to 'pkgs/applications/networking/instant-messengers')
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/jami/default.nix | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/pkgs/applications/networking/instant-messengers/jami/default.nix b/pkgs/applications/networking/instant-messengers/jami/default.nix index 5a002b6be9f38..1b0185447ac03 100644 --- a/pkgs/applications/networking/instant-messengers/jami/default.nix +++ b/pkgs/applications/networking/instant-messengers/jami/default.nix @@ -2,6 +2,7 @@ , lib , pkg-config , fetchFromGitLab +, fetchpatch , gitUpdater , ffmpeg_6 @@ -90,7 +91,15 @@ stdenv.mkDerivation rec { hash = "sha256-QeD2o6uz9r5vc3Scs1oRKYZ+aNH+01TSxLBj71ssfj4="; }; - patches = (map (x: patch-src + x) (readLinesToList ./config/pjsip_patches)); + patches = (map (x: patch-src + x) (readLinesToList ./config/pjsip_patches)) ++ [ + (fetchpatch { + name = "CVE-2023-27585.patch"; + url = "https://github.com/pjsip/pjproject/commit/d1c5e4da5bae7f220bc30719888bb389c905c0c5.patch"; + hash = "sha256-+yyKKTKG2FnfyLWnc4S80vYtDzmiu9yRmuqb5eIulPg="; + }) + ]; + + patchFlags = [ "-p1" "-l" ]; configureFlags = (readLinesToList ./config/pjsip_args_common) ++ lib.optionals stdenv.isLinux (readLinesToList ./config/pjsip_args_linux); |