all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Zheng Junjie <zhengjunjie@iscas.ac.cn>
To: 65777@debbugs.gnu.org
Subject: [bug#65777] [PATCH 1/2] gnu: npiet: fix cross-compile.
Date: Wed,  6 Sep 2023 17:46:48 +0800	[thread overview]
Message-ID: <bb692cd776f2a50d7e8a7d9c3623bd7a18a1aae4.1693993064.git.zhengjunjie@iscas.ac.cn> (raw)
In-Reply-To: <cover.1693993064.git.zhengjunjie@iscas.ac.cn>

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=y, Size: 1323 bytes --]

* gnu/packages/piet.scm (npiet): fix cross-compile.
[arguments]<#:phases>: Use SEARCH-INPUT-FILE replace WHICH.
---
 gnu/packages/piet.scm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/piet.scm b/gnu/packages/piet.scm
index 824efe59de..8e5a313e82 100644
--- a/gnu/packages/piet.scm
+++ b/gnu/packages/piet.scm
@@ -1,6 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2020 Jesse Gibbons <jgibbons2357+guix@gmail.com>
 ;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -46,10 +47,12 @@ (define-public npiet
      `(#:phases
        (modify-phases %standard-phases
          (add-after 'install 'wrap-binaries
-           (lambda* (#:key outputs #:allow-other-keys)
+           (lambda* (#:key inputs outputs #:allow-other-keys)
              (let ((out (assoc-ref outputs "out")))
                (wrap-program (string-append out "/bin/npietedit")
-                 `("PATH" ":" prefix (,(dirname (which "wish")))))
+                 `("PATH" ":" prefix
+                   (,(dirname
+                      (search-input-file inputs "bin/wish")))))
                #t))))))
     (inputs
      (list gd giflib libpng tk))
-- 
2.41.0





  reply	other threads:[~2023-09-06  9:48 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-09-06  9:43 [bug#65777] [PATCH 0/2] npiet: fix cross-compile Zheng Junjie
2023-09-06  9:46 ` Zheng Junjie [this message]
2023-09-06  9:46 ` [bug#65777] [PATCH 2/2] gnu: npiet: Use Gexp Zheng Junjie
2023-09-14 14:55 ` bug#65777: [PATCH 0/2] npiet: fix cross-compile Ludovic Courtès

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=bb692cd776f2a50d7e8a7d9c3623bd7a18a1aae4.1693993064.git.zhengjunjie@iscas.ac.cn \
    --to=zhengjunjie@iscas.ac.cn \
    --cc=65777@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.