diff mbox series

bug#34105: [PATCH] Add pencil2d.

Message ID 87k1iznqai.fsf@gnu.org
State Accepted
Headers show
Series bug#34105: [PATCH] Add pencil2d. | expand

Checks

Context Check Description
cbaines/applying patch fail Apply failed

Commit Message

Ludovic Courtès Jan. 20, 2019, 6:21 p.m. UTC 
Hello,

<pkill9@runbox.com> skribis:

> From d0c680e629b4c85ee462b624c65683a0a52306d9 Mon Sep 17 00:00:00 2001
> From: Pkill -9 <pkill9@runbox.com>
> Date: Wed, 16 Jan 2019 15:14:45 +0000
> Subject: [PATCH] gnu: Add pencil2d.
>
> * gnu/packages/animation.scm (pencil2d): New variable.

Applied with the minor changes below.  Thank you!

Ludo’.
diff mbox series

Patch

diff --git a/gnu/packages/animation.scm b/gnu/packages/animation.scm
index 5b9ca033b5..965fff6d46 100644
--- a/gnu/packages/animation.scm
+++ b/gnu/packages/animation.scm
@@ -1,6 +1,7 @@ 
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2015, 2017 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2019 Pkill -9 <pkill9@runbox.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -26,7 +27,6 @@ 
   #:use-module (guix build-system gnu)
   #:use-module (gnu packages)
   #:use-module (gnu packages algebra)
-  #:use-module (gnu packages bash)
   #:use-module (gnu packages boost)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages fontutils)
@@ -275,27 +275,28 @@  waveform until they line up with the proper sounds.")
                 "1iv7drwxs32mqs3hybjx2lxyqn8cv2b4rw9ny7gzdacsbhi65knr"))))
     (build-system gnu-build-system)
     (inputs
-     `(("bash" ,bash) ;; Bash is used for wrap-program
-       ("qtbase" ,qtbase)
+     `(("qtbase" ,qtbase)
        ("qtxmlpatterns" ,qtxmlpatterns)
        ("qtmultimedia" ,qtmultimedia)
        ("qtsvg" ,qtsvg)))
     (arguments
      `(#:phases
-       (modify-phases standard-phases
+       (modify-phases %standard-phases
          (replace 'configure
            (lambda* (#:key inputs outputs #:allow-other-keys)
-             (let ((out (assoc-ref outputs "out"))
-                   (qmake (string-append (assoc-ref inputs "qtbase")
-                                         "/bin/qmake")))
-               (invoke qmake (string-append "PREFIX=" out)))))
+             (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)))))))))
+                 `("QT_PLUGIN_PATH" ":" prefix (,plugin-path)))
+               #t))))))
     (home-page "https://www.pencil2d.org")
-    (synopsis "Tool to make 2D hand-drawn animations")
-    (description "Pencil2D is an easy, intuitive tool to make 2D hand-drawn animations.")
+    (synopsis "Make 2D hand-drawn animations")
+    (description
+     "Pencil2D is an easy-to-use and intuitive animation and drawing tool.  It
+lets you create traditional hand-drawn animations (cartoons) using both bitmap
+and vector graphics.")
     (license license:gpl2)))