Skip to content

Commit d4c7cea

Browse files
authored
imagemagick: Add fftw support (#350349)
2 parents 7b6331c + 26cc7c6 commit d4c7cea

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

maintainers/maintainer-list.nix

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2951,6 +2951,12 @@
29512951
githubId = 535135;
29522952
name = "Brennon Loveless";
29532953
};
2954+
bloxx12 = {
2955+
email = "[email protected]";
2956+
github = "bloxx12";
2957+
githubId = 75451918;
2958+
name = "Charlie Root";
2959+
};
29542960
bluescreen303 = {
29552961
email = "[email protected]";
29562962
github = "bluescreen303";

pkgs/applications/graphics/ImageMagick/default.nix

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
, openjpegSupport ? !stdenv.hostPlatform.isMinGW, openjpeg
2525
, libwebpSupport ? !stdenv.hostPlatform.isMinGW, libwebp
2626
, libheifSupport ? true, libheif
27+
, fftwSupport ? true, fftw
2728
, potrace
2829
, coreutils
2930
, curl
@@ -76,6 +77,7 @@ stdenv.mkDerivation (finalAttrs: {
7677
(lib.withFeature libjxlSupport "jxl")
7778
(lib.withFeatureAs ghostscriptSupport "gs-font-dir" "${ghostscript.fonts}/share/fonts")
7879
(lib.withFeature ghostscriptSupport "gslib")
80+
(lib.withFeature fftwSupport "fftw")
7981
] ++ lib.optionals stdenv.hostPlatform.isMinGW [
8082
# due to libxml2 being without DLLs ATM
8183
"--enable-static" "--disable-shared"
@@ -113,7 +115,8 @@ stdenv.mkDerivation (finalAttrs: {
113115
++ lib.optional lcms2Support lcms2
114116
++ lib.optional libX11Support libX11
115117
++ lib.optional libXtSupport libXt
116-
++ lib.optional libwebpSupport libwebp;
118+
++ lib.optional libwebpSupport libwebp
119+
++ lib.optional fftwSupport fftw;
117120

118121
postInstall = ''
119122
(cd "$dev/include" && ln -s ImageMagick* ImageMagick)
@@ -146,7 +149,7 @@ stdenv.mkDerivation (finalAttrs: {
146149
description = "Software suite to create, edit, compose, or convert bitmap images";
147150
pkgConfigModules = [ "ImageMagick" "MagickWand" ];
148151
platforms = platforms.linux ++ platforms.darwin;
149-
maintainers = with maintainers; [ dotlambda rhendric ];
152+
maintainers = with maintainers; [ dotlambda rhendric bloxx12 ];
150153
license = licenses.asl20;
151154
mainProgram = "magick";
152155
};

0 commit comments

Comments
 (0)