diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-05-05 08:18:44 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-05-05 08:25:38 +0200 |
| commit | 7a005601d48f760864258e369364b3b847d4e9fd (patch) | |
| tree | fb562597c59110eb319e9cd8f484280fcf587433 /pkgs/applications/graphics/ImageMagick | |
| parent | 7d7a9df3605c86e17bced51afe67eecd43f99754 (diff) | |
| parent | df310048e5f4a516663bf8c5a74029b54813a7f3 (diff) | |
| download | nixpkgs-7a005601d48f760864258e369364b3b847d4e9fd.tar nixpkgs-7a005601d48f760864258e369364b3b847d4e9fd.tar.gz nixpkgs-7a005601d48f760864258e369364b3b847d4e9fd.tar.bz2 nixpkgs-7a005601d48f760864258e369364b3b847d4e9fd.tar.lz nixpkgs-7a005601d48f760864258e369364b3b847d4e9fd.tar.xz nixpkgs-7a005601d48f760864258e369364b3b847d4e9fd.tar.zst nixpkgs-7a005601d48f760864258e369364b3b847d4e9fd.zip | |
Merge branch 'master' to resolve conflicts
Diffstat (limited to 'pkgs/applications/graphics/ImageMagick')
| -rw-r--r-- | pkgs/applications/graphics/ImageMagick/default.nix | 14 | ||||
| -rw-r--r-- | pkgs/applications/graphics/ImageMagick/imagetragick.patch | 15 |
2 files changed, 23 insertions, 6 deletions
diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 76752c94d45..8094252c660 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, fetchpatch, pkgconfig, libtool , bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg -, lcms2, openexr, libpng, librsvg, libtiff, libxml2 +, lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp }: let @@ -11,8 +11,8 @@ let else throw "ImageMagick is not supported on this platform."; cfg = { - version = "6.9.3-8"; - sha256 = "129s4cwp6cbhgsr3xr8186q5j02zpbk6kqfk4j7ayb563zsrdb4h"; + version = "6.9.3-9"; + sha256 = "0q19jgn1iv7zqrw8ibxp4z57iihrc9kyb09k2wnspcacs6vrvinf"; patches = []; } # Freeze version on mingw so we don't need to port the patch too often. @@ -40,7 +40,8 @@ stdenv.mkDerivation rec { ]; inherit (cfg) sha256; }; - inherit (cfg) patches; + + patches = [ ./imagetragick.patch ] ++ cfg.patches; outputs = [ "out" "doc" ]; @@ -65,16 +66,17 @@ stdenv.mkDerivation rec { libpng libtiff libxml2 ] ++ lib.optionals (stdenv.cross.libc or null != "msvcrt") - [ openexr librsvg ] + [ openexr librsvg openjpeg ] ; propagatedBuildInputs = [ bzip2 freetype libjpeg lcms2 ] ++ lib.optionals (stdenv.cross.libc or null != "msvcrt") - [ libX11 libXext libXt ] + [ libX11 libXext libXt libwebp ] ; postInstall = '' + (cd "$out/include" && ln -s ImageMagick* ImageMagick) '' + lib.optionalString (ghostscript != null) '' for la in $out/lib/*.la; do diff --git a/pkgs/applications/graphics/ImageMagick/imagetragick.patch b/pkgs/applications/graphics/ImageMagick/imagetragick.patch new file mode 100644 index 00000000000..bdb152dd23a --- /dev/null +++ b/pkgs/applications/graphics/ImageMagick/imagetragick.patch @@ -0,0 +1,15 @@ +diff --git a/config/policy.xml b/config/policy.xml +index ca3b022..b058c05 100644 +--- a/config/policy.xml ++++ b/config/policy.xml +@@ -58,4 +58,10 @@ + <!-- <policy domain="resource" name="time" value="3600"/> --> + <!-- <policy domain="system" name="precision" value="6"/> --> + <policy domain="cache" name="shared-secret" value="passphrase"/> ++ ++ <policy domain="coder" rights="none" pattern="EPHEMERAL" /> ++ <policy domain="coder" rights="none" pattern="URL" /> ++ <policy domain="coder" rights="none" pattern="HTTPS" /> ++ <policy domain="coder" rights="none" pattern="MVG" /> ++ <policy domain="coder" rights="none" pattern="MSL" /> + </policymap> |