JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libfpx: fix build with gcc6

Browse Source
This commit is contained in:
Samuel Leathers 2017-09-04 09:23:45 -04:00 committed by Robert Helgesson
parent 84ec7ef6c3
commit 402e6ac089
No known key found for this signature in database
GPG Key ID: C3DB11069E65DC86
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/development/libraries/libfpx/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl }: { stdenv, fetchurl, fetchpatch }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libfpx-1.3.1-7"; name = "libfpx-1.3.1-7";
@ -11,6 +11,13 @@ stdenv.mkDerivation rec {
# Darwin gets misdetected as Windows without this # Darwin gets misdetected as Windows without this
NIX_CFLAGS_COMPILE = if stdenv.isDarwin then "-D__unix" else null; NIX_CFLAGS_COMPILE = if stdenv.isDarwin then "-D__unix" else null;
patches = [
(fetchpatch {
url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/libfpx/files/libfpx-1.3.1_p6-gcc6.patch?id=f28a947813dbc0a1fd1a8d4a712d58a64c48ca01";
sha256 = "032y8110zgnkdhkdq3745zk53am1x34d912rai8q70k3sskyq22p";
})
];
# This dead code causes a duplicate symbol error in Clang so just remove it # This dead code causes a duplicate symbol error in Clang so just remove it
postPatch = if stdenv.cc.isClang then '' postPatch = if stdenv.cc.isClang then ''
substituteInPlace jpeg/ejpeg.h --replace "int No_JPEG_Header_Flag" "" substituteInPlace jpeg/ejpeg.h --replace "int No_JPEG_Header_Flag" ""