diff options
| author | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-09-09 12:22:14 +0200 |
|---|---|---|
| committer | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-09-09 12:22:14 +0200 |
| commit | 94ca5b4357af8f8921f0cb0873a7cf316f13aa69 (patch) | |
| tree | 6ef30120737f26f298f7f17d86597b0b729517e0 /gnu/packages/animation.scm | |
| parent | 6750c114e3e988249f4069d0180316c6d0192350 (diff) | |
| parent | db61bdd7f52270a35bd0a3a88650d98276dab20b (diff) | |
| download | guix-94ca5b4357af8f8921f0cb0873a7cf316f13aa69.tar.gz guix-94ca5b4357af8f8921f0cb0873a7cf316f13aa69.zip | |
Merge branch 'master' into emacs-team
Diffstat (limited to 'gnu/packages/animation.scm')
| -rw-r--r-- | gnu/packages/animation.scm | 31 |
1 files changed, 18 insertions, 13 deletions
diff --git a/gnu/packages/animation.scm b/gnu/packages/animation.scm index 9691dd0d80..d6bd3fd03d 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 |