BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

imagemagick: Refactor

Browse source
This commit is contained in:
William A. Kennington III 2015-03-27 15:36:11 -07:00
parent 1f82542fcb
commit 1f632813e4
2 changed files with 95 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

98
pkgs/applications/graphics/ImageMagick/default.nix
View file

@ -1,21 +1,11 @@
{ lib
, stdenv
, fetchurl
, pkgconfig
, bzip2
, fontconfig
, freetype
, ghostscript ? null
, libjpeg
, libpng
, libtiff
, libxml2
, zlib
, libtool
, jasper
, libX11
, tetex ? null
, librsvg ? null
{ stdenv, fetchurl, pkgconfig, libtool
, libcl ? null, perl ? null, jemalloc ? null, bzip2 ? null, zlib ? null
, libX11 ? null, libXext ? null, libXt ? null, dejavu_fonts ? null, fftw ? null
, libfpx ? null, djvulibre ? null, fontconfig ? null, freetype ? null
, ghostscript ? null, graphviz ? null, jbigkit ? null, libjpeg ? null
, lcms2 ? null, openjpeg ? null, liblqr1 ? null, xz ? null, openexr ? null
, pango ? null, libpng ? null, librsvg ? null, libtiff ? null, libwebp ? null
, libxml2 ? null
}:
let
@ -27,8 +17,15 @@ let
else if stdenv.system == "x86_64-linux" || stdenv.system == "x86_64-darwin" then "x86-64"
else throw "ImageMagick is not supported on this platform.";
mkFlag = trueStr: falseStr: cond: val: "--${if cond then trueStr else falseStr}-${val}";
mkWith = mkFlag "with" "without";
mkEnable = mkFlag "enable" "disable";
hasX11 = libX11 != null && libXext != null && libXt != null;
in
with stdenv.lib;
stdenv.mkDerivation rec {
name = "imagemagick-${version}";
@ -39,26 +36,55 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
preConfigure = if tetex != null then
''
export DVIDecodeDelegate=${tetex}/bin/dvips
'' else "";
#preConfigure = if tetex != null then
# ''
# export DVIDecodeDelegate=${tetex}/bin/dvips
# '' else "";
configureFlags =
[ "--with-frozenpaths" ]
++ [ "--with-gcc-arch=${arch}" ]
++ lib.optional (librsvg != null) "--with-rsvg"
++ lib.optionals (stdenv.system != "x86_64-darwin")
[ "--with-gs-font-dir=${ghostscript}/share/ghostscript/fonts"
"--with-gslib"
];
configureFlags = [
(mkEnable (libcl != null) "opencl")
(mkWith true "modules")
(mkWith true "gcc-arch=${arch}")
(mkEnable true "hdri")
(mkWith (perl != null) "perl")
(mkWith (jemalloc != null) "jemalloc")
(mkWith true "frozenpaths")
(mkWith (bzip2 != null) "bzlib")
(mkWith hasX11 "x")
(mkWith (zlib != null) "zlib")
(mkWith false "dps")
(mkWith (fftw != null) "fftw")
(mkWith (libfpx != null) "fpx")
(mkWith (djvulibre != null) "djvu")
(mkWith (fontconfig != null) "fontconfig")
(mkWith (freetype != null) "freetype")
(mkWith (ghostscript != null) "gslib")
(mkWith (graphviz != null) "gvc")
(mkWith (jbigkit != null) "jbig")
(mkWith (libjpeg != null) "jpeg")
(mkWith (lcms2 != null) "lcms2")
(mkWith false "lcms")
(mkWith (openjpeg != null) "openjp2")
(mkWith (liblqr1 != null) "lqr")
(mkWith (xz != null) "lzma")
(mkWith (openexr != null) "openexr")
(mkWith (pango != null) "pango")
(mkWith (libpng != null) "png")
(mkWith (librsvg != null) "rsvg")
(mkWith (libtiff != null) "tiff")
(mkWith (libwebp != null) "webp")
(mkWith (libxml2 != null) "xml")
] ++ optional (dejavu_fonts != null) "--with-dejavu-font-dir=${dejavu_fonts}/share/fonts/truetype/"
++ optional (ghostscript != null) "--with-gs-font-dir=${ghostscript}/share/ghostscript/fonts/";
propagatedBuildInputs =
[ bzip2 fontconfig freetype libjpeg libpng libtiff libxml2 zlib librsvg
libtool jasper libX11
] ++ lib.optional (stdenv.system != "x86_64-darwin") ghostscript;
propagatedBuildInputs = [ ];
buildInputs = [ tetex pkgconfig ];
buildInputs = [
pkgconfig libtool libcl perl jemalloc bzip2 zlib libX11 libXext libXt fftw
libfpx djvulibre fontconfig freetype ghostscript graphviz jbigkit libjpeg
lcms2 openjpeg liblqr1 xz openexr pango libpng librsvg libtiff libwebp
libxml2
];
postInstall = ''(cd "$out/include" && ln -s ImageMagick* ImageMagick)'';
@ -66,6 +92,6 @@ stdenv.mkDerivation rec {
homepage = http://www.imagemagick.org/;
description = "A software suite to create, edit, compose, or convert bitmap images";
platforms = platforms.linux ++ [ "x86_64-darwin" ];
maintainers = with maintainers; [ the-kenny ];
maintainers = with maintainers; [ the-kenny wkennington ];
};
}

36
pkgs/top-level/all-packages.nix
View file

@ -10816,12 +10816,42 @@ let
AuthenPassphrase NetOpenIDConsumer LWPxParanoidAgent CryptSSLeay;
};
imagemagick = callPackage ../applications/graphics/ImageMagick {
tetex = null;
imagemagick_light = imagemagick.override {
libcl = null;
perl = null;
jemalloc = null;
bzip2 = null;
zlib = null;
libX11 = null;
libXext = null;
libXt = null;
dejavu_fonts = null;
fftw = null;
libfpx = null;
djvulibre = null;
fontconfig = null;
freetype = null;
ghostscript = null;
graphviz = null;
jbigkit = null;
libjpeg = null;
lcms2 = null;
openjpeg = null;
liblqr1 = null;
xz = null;
openexr = null;
pango = null;
libpng = null;
librsvg = null;
libtiff = null;
libwebp = null;
libxml2 = null;
};
imagemagickBig = lowPrio (callPackage ../applications/graphics/ImageMagick { });
imagemagick = callPackage ../applications/graphics/ImageMagick {
ghostscript = if stdenv.isDarwin then null else ghostscript;
perl = null; # Currently Broken
};
# Impressive, formerly known as "KeyJNote".
impressive = callPackage ../applications/office/impressive {