unofficial mirror of guix-devel@gnu.org 
 help / color / mirror / code / Atom feed
From: ng0 <ngillmann@runbox.com>
To: guix-devel@gnu.org
Subject: [PATCH] gnu: lispf4: Fix reference to SYSATOMS.
Date: Wed,  5 Oct 2016 09:31:00 +0000	[thread overview]
Message-ID: <20161005093100.9813-1-ngillmann@runbox.com> (raw)
In-Reply-To: <20161004223322.19523-1-ngillmann@runbox.com>

* gnu/packages/lisp.scm (lispf4)[arguments]: Fix reference to SYSATOMS.

This is a solution to and closes #22732.
---
 gnu/packages/lisp.scm | 31 +++++++++++++++++++++----------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm
index 7836d48..04fea72 100644
--- a/gnu/packages/lisp.scm
+++ b/gnu/packages/lisp.scm
@@ -473,18 +473,29 @@ interface.")
          #:tests? #f ; No 'check phase
          #:phases
          (modify-phases %standard-phases
+           ;; TODO: SYSATOMS, BASIC.IMG should not be installed into $out/bin:
+           ;; https://lists.gnu.org/archive/html/guix-devel/2016-10/msg00213.html
            (delete 'configure)
+           (add-before 'build 'fix-reference-to-SYSATOMS
+             (lambda* (#:key outputs #:allow-other-keys)
+               (let* ((out (assoc-ref outputs "out"))
+                      (bin (string-append out "/bin")))
+                 (substitute* "lispf42.c"
+                   (("#define c_b98.*")
+                    (string-append "#define c_b98 \""
+                                   bin "/SYSATOMS\"\n")))
+                 (install-file "SYSATOMS" bin)
+                 #t)))
            (replace 'install
-            (lambda* (#:key outputs #:allow-other-keys)
-              (let* ((out (assoc-ref outputs "out"))
-                     (bin (string-append out "/bin"))
-                     (doc (string-append (assoc-ref outputs "doc")
-                                         "/share/doc/lispf4")))
-                (install-file "lispf4" bin)
-                (install-file "SYSATOMS" bin)
-                (install-file "BASIC.IMG" bin)
-                (copy-recursively "Documentation" doc))
-                #t)))))
+             (lambda* (#:key outputs #:allow-other-keys)
+               (let* ((out (assoc-ref outputs "out"))
+                      (bin (string-append out "/bin"))
+                      (doc (string-append (assoc-ref outputs "doc")
+                                          "/share/doc/lispf4")))
+                 (install-file "lispf4" bin)
+                 (install-file "BASIC.IMG" bin)
+                 (copy-recursively "Documentation" doc))
+               #t)))))
       (synopsis "InterLisp interpreter")
       (description
        "LISPF4 is an InterLisp interpreter written in FORTRAN by Mats Nordstrom
-- 
2.10.1

      parent reply	other threads:[~2016-10-05  9:31 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-10-04 22:33 [PATCH] gnu: lispf4 fixes ng0
2016-10-04 22:33 ` [PATCH 1/2] gnu: lispf4: Remove prebuilt binaries ng0
2016-10-04 22:33 ` [PATCH 2/2] gnu: lispf4: Fix the searchpath for SYSATOMS ng0
2016-10-05  7:08   ` Ricardo Wurmus
2016-10-05  8:54     ` ng0
2016-10-05  9:17       ` ng0
2016-10-05 11:22         ` Ricardo Wurmus
2016-10-05 12:15           ` ng0
2016-10-05  9:27 ` [PATCH] gnu: lispf4 fixes ng0
2016-10-05 10:07   ` ng0
2016-10-05 10:18     ` ng0
2016-10-05  9:31 ` ng0 [this message]

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

  List information: https://guix.gnu.org/

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

  git send-email \
    --in-reply-to=20161005093100.9813-1-ngillmann@runbox.com \
    --to=ngillmann@runbox.com \
    --cc=guix-devel@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 public inbox

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

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).