From bd9f588b37a86845604fbe8506bdfe162ba578b3 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Wed, 15 Jan 2020 01:31:20 +0100
Subject: [PATCH] gnu: noweb: Embed store references to external binaries.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* gnu/packages/noweb.scm (noweb)[argument]: Add ‘bind-early’ phase.
[inputs]: Add perl.
---
gnu/packages/noweb.scm | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/noweb.scm b/gnu/packages/noweb.scm
index 0a0010c6dd4..2fcd24c6e24 100644
--- a/gnu/packages/noweb.scm
+++ b/gnu/packages/noweb.scm
@@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -20,7 +21,8 @@ (define-module (gnu packages noweb)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix build-system gnu)
- #:use-module (guix licenses))
+ #:use-module (guix licenses)
+ #:use-module (gnu packages perl))
(define-public noweb
(package
@@ -37,6 +39,18 @@ (define-public noweb
(arguments
'(#:phases
(modify-phases %standard-phases
+ (add-after 'unpack 'bind-early
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (bin (string-append out "/bin")))
+ (substitute* (list "src/lib/nwmtime"
+ "src/shell/htmltoc")
+ (("exec perl ")
+ (format #f "exec ~a " (which "perl"))))
+ (substitute* "src/shell/noweb"
+ ((" cpif ")
+ (format #f " ~a/cpif " bin)))
+ #t)))
(add-before 'install 'pre-install
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
@@ -82,6 +96,8 @@ (define-public noweb
(string-append "TEXINPUTS=" out
"/share/texmf/tex/latex")))
#:tests? #f)) ; no tests
+ (inputs
+ `(("perl" ,perl)))
(home-page "https://www.cs.tufts.edu/~nr/noweb/")
(synopsis "Literate programming tool")
(description
--
GitLab