From 33a51d78a2c1e6c32f80e0bc321613e9bc78a17f Mon Sep 17 00:00:00 2001 From: Ruud van Asseldonk Date: Sun, 3 Jun 2018 12:00:27 +0200 Subject: [PATCH 1/2] imagemagick: depend on fftw for fft feature --- pkgs/applications/graphics/ImageMagick/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 4b8d2ab291b7..daa48e515b0a 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, pkgconfig, libtool , bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg -, lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp +, lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp, fftw , ApplicationServices , buildPlatform, hostPlatform }: @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { ++ lib.optional stdenv.isDarwin ApplicationServices; propagatedBuildInputs = - [ bzip2 freetype libjpeg lcms2 ] + [ bzip2 freetype libjpeg lcms2 fftw ] ++ lib.optionals (!hostPlatform.isMinGW) [ libX11 libXext libXt libwebp ] ; From 122f66a51315ecd9d7cd4b2d882a195a7ef4f550 Mon Sep 17 00:00:00 2001 From: Ruud van Asseldonk Date: Sun, 3 Jun 2018 12:09:02 +0200 Subject: [PATCH 2/2] imagemagick: set license metadata --- pkgs/applications/graphics/ImageMagick/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index daa48e515b0a..3af6e19b7011 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -101,5 +101,6 @@ stdenv.mkDerivation rec { description = "A software suite to create, edit, compose, or convert bitmap images"; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ the-kenny wkennington ]; + license = licenses.asl20; }; }