~ruther/guix-local

feb52f7fd32335c5ee05635b6b132f7952caced6 — Maxime Devos 4 years ago 7a7be61
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
1 files changed, 7 insertions(+), 13 deletions(-)

M gnu/packages/piet.scm
M gnu/packages/piet.scm => gnu/packages/piet.scm +7 -13
@@ 25,6 25,7 @@
  #: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 @@
                         (,(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 @@ an Algol-like language
         (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 @@ an Algol-like language
                                               (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 @@ an Algol-like language
                   ;; 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