public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #41409 from ruuda/imagemagick-fftw

Browse Source 
imagemagick: depend on fftw for fft feature
This commit is contained in:
xeji
2018-06-03 18:58:44 +02:00
committed by GitHub
parent e4ad5639c0 122f66a513
commit 003dd8588b
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/applications/graphics/ImageMagick/default.nix
View File

@@ -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;
};
}