From 5078e98cf3d09e761d60e51eb3fbae88ea3d12f3 Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Sun, 27 Aug 2023 10:54:41 +0800 Subject: gnu: pencil2d: Fix tests. * gnu/packages/animation.scm (pencil2d)[arguments]: Use gexps. Add fix-tests phase. --- gnu/packages/animation.scm | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/animation.scm b/gnu/packages/animation.scm index 9691dd0d80e..d6bd3fd03d5 100644 --- a/gnu/packages/animation.scm +++ b/gnu/packages/animation.scm @@ -442,19 +442,24 @@ waveform until they line up with the proper sounds.") (inputs (list qtbase-5 qtxmlpatterns qtmultimedia-5 qtsvg-5)) (arguments - `(#:phases - (modify-phases %standard-phases - (replace 'configure - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (invoke "qmake" (string-append "PREFIX=" out))))) - (add-after 'install 'wrap-executable - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (plugin-path (getenv "QT_PLUGIN_PATH"))) - (wrap-program (string-append out "/bin/pencil2d") - `("QT_PLUGIN_PATH" ":" prefix (,plugin-path))) - #t)))))) + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-tests + (lambda _ + ;; Its bundled catch2-2.5.0 fails to build with glibc-2.35. + (copy-file #$(file-append catch2 "/include/catch2/catch.hpp") + "tests/src/catch.hpp"))) + (replace 'configure + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (invoke "qmake" (string-append "PREFIX=" out))))) + (add-after 'install 'wrap-executable + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (plugin-path (getenv "QT_PLUGIN_PATH"))) + (wrap-program (string-append out "/bin/pencil2d") + `("QT_PLUGIN_PATH" ":" prefix (,plugin-path))))))))) (home-page "https://www.pencil2d.org") (synopsis "Make 2D hand-drawn animations") (description -- cgit v1.3