diff options
| author | Samuel Leathers <sam@appliedtrust.com> | 2017-09-04 09:23:45 -0400 |
|---|---|---|
| committer | Robert Helgesson <robert@rycee.net> | 2017-09-05 21:29:10 +0200 |
| commit | 402e6ac0893d59c3e86c38f86ac82a114881950d (patch) | |
| tree | 1eeed64e52f51221d64a9a06fac2c102000847e9 /pkgs | |
| parent | 84ec7ef6c3f616e6cba2d44ee625c28275787049 (diff) | |
| download | nixpkgs-402e6ac0893d59c3e86c38f86ac82a114881950d.tar nixpkgs-402e6ac0893d59c3e86c38f86ac82a114881950d.tar.gz nixpkgs-402e6ac0893d59c3e86c38f86ac82a114881950d.tar.bz2 nixpkgs-402e6ac0893d59c3e86c38f86ac82a114881950d.tar.lz nixpkgs-402e6ac0893d59c3e86c38f86ac82a114881950d.tar.xz nixpkgs-402e6ac0893d59c3e86c38f86ac82a114881950d.tar.zst nixpkgs-402e6ac0893d59c3e86c38f86ac82a114881950d.zip | |
libfpx: fix build with gcc6
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/libfpx/default.nix | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/pkgs/development/libraries/libfpx/default.nix b/pkgs/development/libraries/libfpx/default.nix index 0a7a1d462ee..28e1ad895b4 100644 --- a/pkgs/development/libraries/libfpx/default.nix +++ b/pkgs/development/libraries/libfpx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, fetchpatch }: stdenv.mkDerivation rec { name = "libfpx-1.3.1-7"; @@ -11,6 +11,13 @@ stdenv.mkDerivation rec { # Darwin gets misdetected as Windows without this 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 postPatch = if stdenv.cc.isClang then '' substituteInPlace jpeg/ejpeg.h --replace "int No_JPEG_Header_Flag" "" |