[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/04: gnu: singularity: Patch 'Makefile.in' in a snippet.
From: |
guix-commits |
Subject: |
02/04: gnu: singularity: Patch 'Makefile.in' in a snippet. |
Date: |
Tue, 5 Mar 2019 17:09:04 -0500 (EST) |
civodul pushed a commit to branch master
in repository guix.
commit fbf26cbcf3addebbbf440d4b79bca8a6aecbd257
Author: Ludovic Courtès <address@hidden>
Date: Tue Mar 5 18:32:30 2019 +0100
gnu: singularity: Patch 'Makefile.in' in a snippet.
* gnu/packages/linux.scm (singularity)[source](snippet, modules): New
fields.
[arguments]: Remove 'disable-install-hook' phase.
---
gnu/packages/linux.scm | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index dd9e19a..e4cfc54 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès
<address@hidden>
+;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès
<address@hidden>
;;; Copyright © 2013, 2014, 2015, 2016 Andreas Enge <address@hidden>
;;; Copyright © 2012 Nikita Karetnikov <address@hidden>
;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019 Mark H Weaver
<address@hidden>
@@ -2656,7 +2656,14 @@ thanks to the use of namespaces.")
"/singularity-" version ".tar.gz"))
(sha256
(base32
- "1whx0hqqi1326scgdxxxa1d94vn95mnq0drid6s8wdp84ni4d3gk"))))
+ "1whx0hqqi1326scgdxxxa1d94vn95mnq0drid6s8wdp84ni4d3gk"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ ;; Do not create directories in /var.
+ (substitute* "Makefile.in"
+ (("\\$\\(MAKE\\) .*install-data-hook") ""))
+ #t))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags
@@ -2664,12 +2671,6 @@ thanks to the use of namespaces.")
"--localstatedir=/var")
#:phases
(modify-phases %standard-phases
- ;; Do not create directories in /var.
- (add-after 'unpack 'disable-install-hook
- (lambda _
- (substitute* "Makefile.in"
- (("\\$\\(MAKE\\) .*install-data-hook") ""))
- #t))
(add-after 'unpack 'patch-reference-to-squashfs-tools
(lambda _
(substitute* "libexec/cli/build.exec"