ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-29 14:57:28 +03:00
Code Issues Projects Releases Wiki Activity

libjpeg: 2.0.4 -> 2.0.5

Browse Source 
https://github.com/libjpeg-turbo/libjpeg-turbo/releases/tag/2.0.5
This commit is contained in:
TredwellGit 2020-09-30 12:44:00 +00:00 committed by Frederik Rietdijk
parent 13eb51b092
commit 9702f49ec6
1 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pkgs/development/libraries/libjpeg-turbo/default.nix
View File

@ -1,30 +1,18 @@
{ stdenv, fetchurl, fetchpatch, cmake, nasm, enableStatic ? false, enableShared ? true }: { stdenv, fetchFromGitHub, cmake, nasm, enableStatic ? false, enableShared ? true }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libjpeg-turbo"; pname = "libjpeg-turbo";
version = "2.0.4"; version = "2.0.5";
src = fetchurl { src = fetchFromGitHub {
url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; owner = "libjpeg-turbo";
sha256 = "01ill8bgjyk582wipx7sh7gj2nidylpbzvwhx0wkcm6mxx3qbp9k"; repo = "libjpeg-turbo";
rev = version;
sha256 = "0p32yivybxdicm01qa9h1vj91apygzxpvnklrjmbx8z9z2l3qxc9";
}; };
patches = patches =
[
# Fixes race in tests that causes "jpegtran-shared-icc" to fail
# https://github.com/libjpeg-turbo/libjpeg-turbo/pull/425
(fetchpatch {
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") stdenv.lib.optional (stdenv.hostPlatform.libc or null == "msvcrt")
./mingw-boolean.patch; ./mingw-boolean.patch;
@ -41,7 +29,7 @@ stdenv.mkDerivation rec {
installCheckTarget = "test"; installCheckTarget = "test";
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = "http://libjpeg-turbo.virtualgl.org/"; homepage = "https://libjpeg-turbo.org/";
description = "A faster (using SIMD) libjpeg implementation"; description = "A faster (using SIMD) libjpeg implementation";
license = licenses.ijg; # and some parts under other BSD-style licenses license = licenses.ijg; # and some parts under other BSD-style licenses
maintainers = with maintainers; [ vcunat colemickens ]; maintainers = with maintainers; [ vcunat colemickens ];