From d05c2e3980f6000539f47e822b3811a6f113b95c Mon Sep 17 00:00:00 2001 From: Charlie Root Date: Mon, 21 Oct 2024 22:23:09 +0200 Subject: [PATCH 1/3] imagemagick: Add fftw support --- pkgs/applications/graphics/ImageMagick/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index aa613ef09ae9..8f96fa252fc0 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) From 084f73e7289a6c6293483844248dc7d954e8757c Mon Sep 17 00:00:00 2001 From: Charlie Root Date: Mon, 21 Oct 2024 22:43:37 +0200 Subject: [PATCH 2/3] maintainers: add bloxx12 --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 5ad8fdbbbacb..0de040b23d07 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2915,6 +2915,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"; From 26cc7c67b259d281df88321451427f49018f99f8 Mon Sep 17 00:00:00 2001 From: Charlie Root Date: Tue, 22 Oct 2024 15:59:37 +0200 Subject: [PATCH 3/3] imagemagick: add bloxx12 to maintainers --- pkgs/applications/graphics/ImageMagick/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 8f96fa252fc0..fd45ff16d257 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -149,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"; };