diff options
| author | Mark H Weaver <mhw@netris.org> | 2015-04-17 22:06:05 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2015-04-17 22:06:05 -0400 |
| commit | 334345d9db53326fa062298e2372d6c33123949a (patch) | |
| tree | 50774c171f1a348bd7de8e9a447bad2a14a9dffb /gnu/packages/imagemagick.scm | |
| parent | 8d7dc5d9dbf009009d33e21598f92c4685965cd5 (diff) | |
| parent | 09dd019490e4a269b0a2d9512a07688f8ee657d3 (diff) | |
| download | guix-334345d9db53326fa062298e2372d6c33123949a.tar guix-334345d9db53326fa062298e2372d6c33123949a.tar.gz | |
Merge branch 'core-updates'
Diffstat (limited to 'gnu/packages/imagemagick.scm')
| -rw-r--r-- | gnu/packages/imagemagick.scm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gnu/packages/imagemagick.scm b/gnu/packages/imagemagick.scm index 2a68627dc6..ab663b5a41 100644 --- a/gnu/packages/imagemagick.scm +++ b/gnu/packages/imagemagick.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2015 Eric Bavier <bavier@member.fsf.org> ;;; ;;; This file is part of GNU Guix. @@ -112,7 +112,7 @@ text, lines, polygons, ellipses and Bézier curves.") `(#:phases (modify-phases %standard-phases (add-before - configure image-magick-flags + 'configure 'image-magick-flags (lambda* (#:key inputs #:allow-other-keys) (let ((im (assoc-ref inputs "imagemagick"))) (substitute* "Makefile.PL" @@ -121,7 +121,7 @@ text, lines, polygons, ellipses and Bézier curves.") (("my \\$LIBS_magick = .*") "my $LIBS_magick = `pkg-config --libs ImageMagick`;\n"))))) (add-before - check skip-mpeg-tests + 'check 'skip-mpeg-tests (lambda _ ;; TODO: MPEG tests fail even though our imagemagick supports ;; MPEG. Has been reported elsewhere, |