From feb52f7fd32335c5ee05635b6b132f7952caced6 Mon Sep 17 00:00:00 2001
From: Maxime Devos <maximedevos@telenet.be>
Date: Fri, 2 Jul 2021 12:13:17 +0200
Subject: gnu: piet: Add 'bash' input for 'wrap-program'.

It is required for cross-compilation.

* gnu/packages/piet.scm
(npiet)[inputs]: Add 'bash-minimal'.
(piet-toolchain): Delete trailing #t.
[inputs]: Add 'bash-minimal'.

Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Modified-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Change-Id: I804edbb3696fda1cee9df579be2cfd7158b18514
---
 gnu/packages/piet.scm | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/piet.scm b/gnu/packages/piet.scm
index 0b16299482..326520adf3 100644
--- a/gnu/packages/piet.scm
+++ b/gnu/packages/piet.scm
@@ -25,6 +25,7 @@ (define-module (gnu packages piet)
   #:use-module (guix git-download)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix build-system gnu)
+  #:use-module (gnu packages bash)
   #:use-module (gnu packages gd)
   #:use-module (gnu packages groff)
   #:use-module (gnu packages image)
@@ -56,8 +57,7 @@ (define-public npiet
                          (,(dirname
                             (search-input-file
                              inputs "bin/wish")))))))))))
-    (inputs
-     (list gd giflib libpng tk))
+    (inputs (list bash-minimal gd giflib libpng tk))
     (native-inputs (list groff))
     (synopsis "Piet interpreter")
     (description
@@ -94,8 +94,7 @@ (define-public piet-toolchain
          (snippet
           '(begin
              ;; Remove a bundled fork of Marc Majcher's Piet interpreter.
-             (delete-file-recursively "interpreter")
-             #t))))
+             (delete-file-recursively "interpreter")))))
       (build-system gnu-build-system)
       (arguments
        `(#:modules ((guix build gnu-build-system)
@@ -126,8 +125,7 @@ (define-public piet-toolchain
                                                (string-append doc "/" file)))
                            (list "assembler-samples"
                                  "compiler-samples"
-                                 "README.md")) ; includes the licence grant
-                 #t)))
+                                 "README.md"))))) ;includes the licence grant
            (add-after 'install 'check
              (lambda* (#:key outputs tests? #:allow-other-keys)
                (let* ((out (assoc-ref outputs "out"))
@@ -149,13 +147,9 @@ (define-public piet-toolchain
                    ;; Don't run the interactive one.
                    (delete-file "assembler-samples/quest.piet.png")
                    (for-each (cut invoke "npiet" <>)
-                             (find-files "." "\\.png$"))
-                   #t)))))))
-      (native-inputs
-       ;; For our tests.
-       (list netpbm npiet))
-      (inputs
-       (list perl perl-parse-recdescent))
+                             (find-files "." "\\.png$")))))))))
+      (native-inputs (list netpbm npiet)) ;for tests
+      (inputs (list bash-minimal perl perl-parse-recdescent))
       (home-page "https://www.toothycat.net/wiki/wiki.pl?MoonShadow/Piet")
       (synopsis "Piet compiler and assembler")
       (description
-- 
cgit v1.2.3