diff options
| author | xeji <36407913+xeji@users.noreply.github.com> | 2018-06-03 18:58:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-03 18:58:44 +0200 |
| commit | 003dd8588b9e756176533138ded6d09cafdbac0a (patch) | |
| tree | 132776dd559c1348819d8ca9cbcf7dc7bfed53df /pkgs/applications/graphics | |
| parent | e4ad5639c0546bbe20e5a0db1bd98243ee8497e6 (diff) | |
| parent | 122f66a51315ecd9d7cd4b2d882a195a7ef4f550 (diff) | |
| download | nixlib-003dd8588b9e756176533138ded6d09cafdbac0a.tar nixlib-003dd8588b9e756176533138ded6d09cafdbac0a.tar.gz nixlib-003dd8588b9e756176533138ded6d09cafdbac0a.tar.bz2 nixlib-003dd8588b9e756176533138ded6d09cafdbac0a.tar.lz nixlib-003dd8588b9e756176533138ded6d09cafdbac0a.tar.xz nixlib-003dd8588b9e756176533138ded6d09cafdbac0a.tar.zst nixlib-003dd8588b9e756176533138ded6d09cafdbac0a.zip | |
Merge pull request #41409 from ruuda/imagemagick-fftw
imagemagick: depend on fftw for fft feature
Diffstat (limited to 'pkgs/applications/graphics')
| -rw-r--r-- | pkgs/applications/graphics/ImageMagick/default.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 4b8d2ab291b7..3af6e19b7011 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 ] ; @@ -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; }; } |