pyrox.dev
lol
Merge pull request #173371 from trofi/fix-fno-common-for-libfpx
libfpx: pull upstream fix for -fno-common toolchains
+7
-5
+7
-5
pkgs/development/libraries/libfpx/default.nix
+7
-5
pkgs/development/libraries/libfpx/default.nix
···
17
17
url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/libfpx/files/libfpx-1.3.1_p6-gcc6.patch?id=f28a947813dbc0a1fd1a8d4a712d58a64c48ca01";
18
18
sha256 = "032y8110zgnkdhkdq3745zk53am1x34d912rai8q70k3sskyq22p";
19
19
})
20
+
# Pull upstream fix for -fno-common:
21
+
# https://github.com/ImageMagick/libfpx/pull/1
22
+
(fetchpatch {
23
+
name = "fno-common.patch";
24
+
url = "https://github.com/ImageMagick/libfpx/commit/c32b340581ba6c88c5092f374f655c7579b598a6.patch";
25
+
sha256 = "1gbc0qb2ri1mj9r66wx0yn28fsr7zhhlyz2mwbica8wh34xijgz9";
26
+
})
20
27
];
21
-
22
-
# This dead code causes a duplicate symbol error in Clang so just remove it
23
-
postPatch = if stdenv.cc.isClang then ''
24
-
substituteInPlace jpeg/ejpeg.h --replace "int No_JPEG_Header_Flag" ""
25
-
'' else null;
26
28
27
29
meta = with lib; {
28
30
homepage = "http://www.imagemagick.org";