[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#26730: [PATCH 2/2] gnu: bzip2: Patch bzip2 utilities.
From: |
Christopher Baines |
Subject: |
bug#26730: [PATCH 2/2] gnu: bzip2: Patch bzip2 utilities. |
Date: |
Mon, 1 May 2017 11:10:15 +0100 |
* gnu/packages/compression.scm (bzip2)[inputs]: Add grep, less, diffutils, sed
and coreutils.
[arguments]: Add patch-script phase.
---
gnu/packages/compression.scm | 44 +++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 43 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index 031ecaad4..fe32b95bd 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -46,6 +46,7 @@
#:use-module (gnu packages backup)
#:use-module (gnu packages base)
#:use-module (gnu packages check)
+ #:use-module (gnu packages less)
#:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
@@ -218,6 +219,12 @@ file; as a result, it is often used in conjunction with
\"tar\", resulting in
(base32
"1kfrc7f0ja9fdn6j1y6yir6li818npy6217hvr3wzmnmzhs8z152"))))
(build-system gnu-build-system)
+ (inputs
+ `(("grep" ,grep)
+ ("less" ,less)
+ ("diff" ,diffutils)
+ ("sed" ,sed)
+ ("coreutils" ,coreutils)))
(arguments
`(#:modules ((guix build gnu-build-system)
(guix build utils)
@@ -252,7 +259,42 @@ file; as a result, it is often used in conjunction with
\"tar\", resulting in
base libdir)
(copy-file file
(string-append libdir "/" base))))
- (find-files "." "^libbz2\\.so"))))))
+ (find-files "." "^libbz2\\.so")))))
+ (add-after 'install-shared-lib 'patch-scripts
+ (lambda* (#:key outputs inputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (grep (assoc-ref inputs "grep"))
+ (less (assoc-ref inputs "less"))
+ (diff (assoc-ref inputs "diff"))
+ (sed (assoc-ref inputs "sed"))
+ (coreutils (assoc-ref inputs "coreutils")))
+ (substitute* (string-append out "/bin/bzgrep")
+ (("/usr/bin:\\$PATH")
+ (string-join
+ (list (string-append grep "/bin")
+ (string-append out "/bin")
+ (string-append sed "/bin"))
+ ":")))
+ (substitute* (string-append out "/bin/bzmore")
+ (("/usr/bin") ;; Don't remove $PATH, as if bzmore is to work,
+ ;; more must be on the PATH in the
+ ;; environment. util-linux, which contains more
+ ;; is not included here as there is a potential
+ ;; issues with circular dependencies.
+ (string-join
+ (list (string-append less "/bin")
+ (string-append sed "/bin")
+ (string-append out "/bin"))
+ ":")))
+ (substitute* (string-append out "/bin/bzdiff")
+ (("/usr/bin:/bin:\\$PATH")
+ (string-join
+ (list (string-append diff "/bin")
+ (string-append coreutils "/bin")
+ (string-append out "/bin")
+ (string-append sed "/bin"))
+ ":"))
+ (("/bin/rm") "rm"))))))
#:make-flags (list (string-append "PREFIX="
(assoc-ref %outputs "out")))
--
2.12.2