imagemagick: More cleanups

This commit is contained in:
William A. Kennington III 2015-03-27 15:46:08 -07:00
parent 1f632813e4
commit 49e980fa32

View File

@ -36,11 +36,6 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
#preConfigure = if tetex != null then
# ''
# export DVIDecodeDelegate=${tetex}/bin/dvips
# '' else "";
configureFlags = [ configureFlags = [
(mkEnable (libcl != null) "opencl") (mkEnable (libcl != null) "opencl")
(mkWith true "modules") (mkWith true "modules")
@ -77,8 +72,6 @@ stdenv.mkDerivation rec {
] ++ optional (dejavu_fonts != null) "--with-dejavu-font-dir=${dejavu_fonts}/share/fonts/truetype/" ] ++ optional (dejavu_fonts != null) "--with-dejavu-font-dir=${dejavu_fonts}/share/fonts/truetype/"
++ optional (ghostscript != null) "--with-gs-font-dir=${ghostscript}/share/ghostscript/fonts/"; ++ optional (ghostscript != null) "--with-gs-font-dir=${ghostscript}/share/ghostscript/fonts/";
propagatedBuildInputs = [ ];
buildInputs = [ buildInputs = [
pkgconfig libtool libcl perl jemalloc bzip2 zlib libX11 libXext libXt fftw pkgconfig libtool libcl perl jemalloc bzip2 zlib libX11 libXext libXt fftw
libfpx djvulibre fontconfig freetype ghostscript graphviz jbigkit libjpeg libfpx djvulibre fontconfig freetype ghostscript graphviz jbigkit libjpeg