imlib: fix build with giflib; clarify license
libungif was merged into giflib in 2006, and hasn't been updated since.
This commit is contained in:
parent
6694363a3a
commit
a2a5b1d6e7
|
@ -1,4 +1,6 @@
|
|||
{lib, stdenv, fetchurl, fetchpatch, libX11, libXext, xorgproto, libjpeg, libungif, libtiff, libpng}:
|
||||
{ lib, stdenv, fetchurl, fetchpatch
|
||||
, libX11, libXext, xorgproto, libjpeg, giflib, libtiff, libpng
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "imlib-1.9.15";
|
||||
|
@ -13,6 +15,16 @@ stdenv.mkDerivation {
|
|||
url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/imlib/files/imlib-1.9.15-bpp16-CVE-2007-3568.patch";
|
||||
sha256 = "0lxfibi094gki39sq1w4p0hcx25xlk0875agbhjkjngzx862wvbg";
|
||||
})
|
||||
|
||||
# The following two patches fix the build with recent giflib.
|
||||
(fetchpatch {
|
||||
url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/imlib/files/imlib-1.9.15-giflib51-1.patch?id=c6d0ed89ad5653421f21cbf3b3d40fd9a1361828";
|
||||
sha256 = "0jynlhxcyjiwnz1m8j48xwz4z5csgyg03jfjc8xgpvvcyid4m65l";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/imlib/files/imlib-1.9.15-giflib51-2.patch?id=c6d0ed89ad5653421f21cbf3b3d40fd9a1361828";
|
||||
sha256 = "164x7rd992930rqllmr89p5ahfmbz37ipi8x0igd8gkvc8a4fd5x";
|
||||
})
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
|
@ -21,11 +33,11 @@ stdenv.mkDerivation {
|
|||
"--x-libraries=${libX11.out}/lib"
|
||||
];
|
||||
|
||||
buildInputs = [libjpeg libXext libX11 xorgproto libtiff libungif libpng];
|
||||
buildInputs = [ libjpeg libXext libX11 xorgproto libtiff giflib libpng ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "An image loading and rendering library for X11";
|
||||
platforms = platforms.unix;
|
||||
license = with licenses; [ gpl2 lgpl2 ];
|
||||
license = with licenses; [ gpl2Only lgpl2Only ];
|
||||
};
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue