diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-06-25 20:35:19 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-06-25 20:35:19 +0200 |
| commit | 679136e25258760f9991cdbb8d26440e666daf78 (patch) | |
| tree | 6675bdf0983876aa26417101492a5c54e30efcc3 /pkgs/development/libraries/libjpeg-turbo/default.nix | |
| parent | 7a3be9661438e1e59592fd3fbc7198b88842d1cd (diff) | |
| parent | bef20b38efca840135d7f174f5044d098a7deca2 (diff) | |
| download | nixlib-679136e25258760f9991cdbb8d26440e666daf78.tar nixlib-679136e25258760f9991cdbb8d26440e666daf78.tar.gz nixlib-679136e25258760f9991cdbb8d26440e666daf78.tar.bz2 nixlib-679136e25258760f9991cdbb8d26440e666daf78.tar.lz nixlib-679136e25258760f9991cdbb8d26440e666daf78.tar.xz nixlib-679136e25258760f9991cdbb8d26440e666daf78.tar.zst nixlib-679136e25258760f9991cdbb8d26440e666daf78.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/development/libraries/libjpeg-turbo/default.nix')
| -rw-r--r-- | pkgs/development/libraries/libjpeg-turbo/default.nix | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix index 72d8b9677499..9bd909d3f6e8 100644 --- a/pkgs/development/libraries/libjpeg-turbo/default.nix +++ b/pkgs/development/libraries/libjpeg-turbo/default.nix @@ -18,6 +18,12 @@ stdenv.mkDerivation rec { url = "https://github.com/libjpeg-turbo/libjpeg-turbo/commit/a2291b252de1413a13db61b21863ae7aea0946f3.patch"; sha256 = "0nc5vcch5h52gpi07h08zf8br58q8x81q2hv871hrn0dinb53vym"; }) + + (fetchpatch { + name = "cve-2020-13790.patch"; + url = "https://github.com/libjpeg-turbo/libjpeg-turbo/commit/3de15e0c344d.diff"; + sha256 = "0hm5i6qir5w3zxb0xvqdh4jyvbfg7xnd28arhyfsaclfz9wdb0pb"; + }) ] ++ stdenv.lib.optional (stdenv.hostPlatform.libc or null == "msvcrt") ./mingw-boolean.patch; |