GNU bug report logs - #72001
[PATCH 1/2] gnu: Add icon.

Previous Next

Package: guix-patches;

Reported by: Antero Mejr <mail <at> antr.me>

Date: Mon, 8 Jul 2024 23:05:02 UTC

Severity: normal

Tags: patch

Full log


Message #11 received at 72001 <at> debbugs.gnu.org (full text, mbox):

From: Sharlatan Hellseher <sharlatanus <at> gmail.com>
To: 72001 <at> debbugs.gnu.org
Subject: [PATCH 1/2] gnu: Add icon.
Date: Tue, 09 Jul 2024 10:02:08 +0100
[Message part 1 (text/plain, inline)]
Hi,

Thank you for the patches.

QA looks happy on most systems. There are some adjustment which may be
applied:

--8<---------------cut here---------------start------------->8---
+                            (for-each
+                             (lambda (x)
+                               (substitute* x
+                                 (("/bin/sh")
+                                  (string-append
+                                   #$(this-package-input "bash-minimal")
+                                   "/bin/bash"))))
+                             '("ipl/progs/shar.icn"
+                               "ipl/progs/ipatch.icn"
+                               "src/icont/link.c"))))
--8<---------------cut here---------------end--------------->8---

SUBSTITUTE* supports a list of files and this part may be simplified e.g.

--8<---------------cut here---------------start------------->8---
(substitute* '("ipl/progs/shar.icn"
               "ipl/progs/ipatch.icn"
               "src/icont/link.c")
  (("/bin/sh")
   (string-append #$(this-package-input "bash-minimal") "/bin/bash")))
--8<---------------cut here---------------end--------------->8---

It looks like upstream prefers esoteric approach in Makefile as well,
IMHO the standard phases may be preserved with patching Makefile targets
while providing <#:configure-flags> or <#:make-flags>:

--8<---------------cut here---------------start------------->8---
+                        (replace 'configure
+                          (lambda _
+                            (invoke "make" "X-Configure" "name=linux")))
+                        (replace 'install
+                          (lambda _
+                            (invoke "make" "Install"
+                                    (string-append "dest=" #$output))))
+                        (replace 'check
+                          (lambda* (#:key tests? #:allow-other-keys)
+                            (when tests?
+                              (invoke "make" "Test")))))))
--8<---------------cut here---------------end--------------->8---

Is Bash required during runtime as well? If not we may place it in
NATIVE-INPUTS:

--8<---------------cut here---------------start------------->8---
+    (inputs (list bash-minimal libx11 libxpm libxt libxaw))
--8<---------------cut here---------------end--------------->8---

Looking forward for v2!

--
Oleg
[signature.asc (application/pgp-signature, inline)]

This bug report was last modified 345 days ago.

Previous Next


GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.