diff options
| author | Alyssa Ross <hi@alyssa.is> | 2022-12-06 19:57:55 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-02-08 13:48:30 +0000 |
| commit | bf3aadfdd39aa197e18bade671fab6726349ffa4 (patch) | |
| tree | 698567af766ed441d757b57a7b21e68d4a342a2b /nixpkgs/pkgs/development/libraries/libfpx | |
| parent | f4afc5a01d9539ce09e47494e679c51f80723d07 (diff) | |
| parent | 99665eb45f58d959d2cb9e49ddb960c79d596f33 (diff) | |
| download | nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.gz nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.bz2 nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.lz nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.xz nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.zst nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.zip | |
Merge commit '99665eb45f58d959d2cb9e49ddb960c79d596f33'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libfpx')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/libfpx/default.nix | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libfpx/default.nix b/nixpkgs/pkgs/development/libraries/libfpx/default.nix index 589c08399a70..963c93ffc592 100644 --- a/nixpkgs/pkgs/development/libraries/libfpx/default.nix +++ b/nixpkgs/pkgs/development/libraries/libfpx/default.nix @@ -17,13 +17,15 @@ stdenv.mkDerivation rec { url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/libfpx/files/libfpx-1.3.1_p6-gcc6.patch?id=f28a947813dbc0a1fd1a8d4a712d58a64c48ca01"; sha256 = "032y8110zgnkdhkdq3745zk53am1x34d912rai8q70k3sskyq22p"; }) + # Pull upstream fix for -fno-common: + # https://github.com/ImageMagick/libfpx/pull/1 + (fetchpatch { + name = "fno-common.patch"; + url = "https://github.com/ImageMagick/libfpx/commit/c32b340581ba6c88c5092f374f655c7579b598a6.patch"; + sha256 = "1gbc0qb2ri1mj9r66wx0yn28fsr7zhhlyz2mwbica8wh34xijgz9"; + }) ]; - # 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" "" - '' else null; - meta = with lib; { homepage = "http://www.imagemagick.org"; description = "A library for manipulating FlashPIX images"; |