nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-07-21 16:11:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

libjxl: add patch for CVE-2021-22564

Browse Source
This commit is contained in:
Robert Scott
2021-12-05 19:05:54 +00:00
parent 1b9a09cbf6
commit 9184c19b25
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/development/libraries/libjxl/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub
{ stdenv, lib, fetchFromGitHub, fetchpatch
, asciidoc
, brotli
, cmake
@@ -29,6 +29,20 @@ stdenv.mkDerivation rec {
fetchSubmodules = true;
};
patches = [
(fetchpatch {
name = "CVE-2021-22564.prerequisite.patch";
url = "https://github.com/libjxl/libjxl/commit/482d0a24f891c641caae4369676ed303406dccac.patch";
sha256 = "1c0nm667jahzr04iyfkg7zjj0wf7igc8m0l5gczl50zbxgz17vmp";
includes = [ "lib/jxl/base/random.h" ];
})
(fetchpatch {
name = "CVE-2021-22564.patch";
url = "https://github.com/libjxl/libjxl/commit/e6497057899269bb40f54a26729826a55d857fd7.patch";
sha256 = "0yybl7dhhz0wawczmmka3ikysxz5ispj1b7z6bc7bp91glc0hk47";
})
];
# hydra's darwin machines run into https://github.com/libjxl/libjxl/issues/408
# unless we disable highway's tests
postPatch = lib.optional stdenv.isDarwin ''