diff options
Diffstat (limited to 'gnu/packages/inkscape.scm')
| -rw-r--r-- | gnu/packages/inkscape.scm | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/gnu/packages/inkscape.scm b/gnu/packages/inkscape.scm index c75c4822b3..e3acf3fd71 100644 --- a/gnu/packages/inkscape.scm +++ b/gnu/packages/inkscape.scm @@ -160,7 +160,6 @@ endif()~%~%" (build-system cmake-build-system) (arguments (list - #:test-target "check" ;otherwise some test binaries are missing #:disallowed-references (list imagemagick/stable) #:imported-modules `(,@%cmake-build-system-modules (guix build glib-or-gtk-build-system)) @@ -260,7 +259,7 @@ endif()~%~%" '())))) (invoke "make" "-j" job-count "tests") (invoke "ctest" "-j" job-count - "--output-on-error" + "--output-on-failure" "-E" (string-append "(" (string-join skipped-tests "|") ")")))))) (add-after 'install 'glib-or-gtk-compile-schemas @@ -358,6 +357,8 @@ as the native format.") (build-system cmake-build-system) (arguments (substitute-keyword-arguments (package-arguments inkscape/pinned) + ((#:modules modules) + (append '(((guix build gnu-build-system) #:prefix gnu:)) modules)) ((#:configure-flags flags ''()) ;; Enable ImageMagick support. #~(delete "-DWITH_IMAGE_MAGICK=OFF" #$flags)) @@ -371,11 +372,9 @@ as the native format.") #$%inkscape-release-year))))) #$@(if (target-x86-32?) #~() ;XXX: there are remaining failures on i686 - #~((replace 'check - ;; Re-instate the tests disabled in inkscape/pinned, now that - ;; their ImageMagick requirement is satisfied. - (assoc-ref %standard-phases 'check)))) - + ;; Re-instate the tests disabled in inkscape/pinned, now that + ;; their ImageMagick requirement is satisfied. + #~((replace 'check (assoc-ref gnu:%standard-phases 'check)))) (replace 'wrap-program ;; Ensure Python is available at runtime. (lambda _ |