mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-26 21:33:03 +03:00
libgdiplus: fix segfaults by patches from master and dropping libungif
Configure script complains, that unable to build gif loading support, but it's a lie -- it builds against libgif 5, which have DGifOpenFile as well. Cherry-picked by @obadz from8439304ebc
(libungif was already dropped by commitb41ede5e3a
)
This commit is contained in:
parent
f382eb7d61
commit
afbd840d24
@ -1,6 +1,6 @@
|
||||
{ stdenv, fetchFromGitHub, pkgconfig, glib, cairo, Carbon, fontconfig
|
||||
, libtiff, giflib, libjpeg, libpng
|
||||
, libXrender, libexif, autoreconfHook }:
|
||||
, libXrender, libexif, autoreconfHook, fetchpatch }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libgdiplus-5.6";
|
||||
@ -14,9 +14,20 @@ stdenv.mkDerivation rec {
|
||||
|
||||
NIX_LDFLAGS = "-lgif";
|
||||
|
||||
patches = [ ];
|
||||
|
||||
patchFlags = "-p0";
|
||||
patches = [ # Series of patches cherry-picked from master, all fixes various sigsegv (or required by other patch)
|
||||
(fetchpatch {
|
||||
url = "https://github.com/mono/libgdiplus/commit/d33a2580a94701ff33abe28c22881d6173be57d0.patch";
|
||||
sha256 = "0rr54jylscn4icqjprqhwrncyr92r0d7kmfrrq3myskplpqv1c11";
|
||||
})
|
||||
(fetchpatch {
|
||||
url ="https://github.com/mono/libgdiplus/commit/aa6aa53906935572f52f519fe4ab9ebedc051d08.patch";
|
||||
sha256 = "1wg0avm8qv5cb4vk80baflfzszm6q7ydhn89c3h6kq68hg6zsf1f";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/mono/libgdiplus/commit/81e45a1d5a3ac3cf035bcc3fabb2859818b6cc04.patch";
|
||||
sha256 = "07wmc88cd1lqifs5x6npryni65jyy9gi8lgr2i1lb7v0fhvlyswg";
|
||||
})
|
||||
];
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
@ -32,6 +43,10 @@ stdenv.mkDerivation rec {
|
||||
ln -s $out/lib/libgdiplus.0.dylib $out/lib/libgdiplus.so
|
||||
'';
|
||||
|
||||
checkPhase = ''
|
||||
make check -w
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Mono library that provides a GDI+-compatible API on non-Windows operating systems";
|
||||
homepage = https://www.mono-project.com/docs/gui/libgdiplus/;
|
||||
|
Loading…
Reference in New Issue
Block a user