diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index de7d8cbb698e..574e5564730a 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2951,6 +2951,12 @@ githubId = 535135; name = "Brennon Loveless"; }; + bloxx12 = { + email = "charlie@charlieroot.dev"; + github = "bloxx12"; + githubId = 75451918; + name = "Charlie Root"; + }; bluescreen303 = { email = "mathijs@bluescreen303.nl"; github = "bluescreen303"; diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index aa613ef09ae9..fd45ff16d257 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -24,6 +24,7 @@ , openjpegSupport ? !stdenv.hostPlatform.isMinGW, openjpeg , libwebpSupport ? !stdenv.hostPlatform.isMinGW, libwebp , libheifSupport ? true, libheif +, fftwSupport ? true, fftw , potrace , coreutils , curl @@ -76,6 +77,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.withFeature libjxlSupport "jxl") (lib.withFeatureAs ghostscriptSupport "gs-font-dir" "${ghostscript.fonts}/share/fonts") (lib.withFeature ghostscriptSupport "gslib") + (lib.withFeature fftwSupport "fftw") ] ++ lib.optionals stdenv.hostPlatform.isMinGW [ # due to libxml2 being without DLLs ATM "--enable-static" "--disable-shared" @@ -113,7 +115,8 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional lcms2Support lcms2 ++ lib.optional libX11Support libX11 ++ lib.optional libXtSupport libXt - ++ lib.optional libwebpSupport libwebp; + ++ lib.optional libwebpSupport libwebp + ++ lib.optional fftwSupport fftw; postInstall = '' (cd "$dev/include" && ln -s ImageMagick* ImageMagick) @@ -146,7 +149,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Software suite to create, edit, compose, or convert bitmap images"; pkgConfigModules = [ "ImageMagick" "MagickWand" ]; platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ dotlambda rhendric ]; + maintainers = with maintainers; [ dotlambda rhendric bloxx12 ]; license = licenses.asl20; mainProgram = "magick"; };