diff options
| author | Ludovic Courtès <ludovic.courtes@inria.fr> | 2019-03-05 18:32:30 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2019-03-05 23:08:53 +0100 |
| commit | fbf26cbcf3addebbbf440d4b79bca8a6aecbd257 (patch) | |
| tree | 5e2c9a65b0ec0ac7a35f62fb246995a9b43abe61 | |
| parent | 107b081ef795c856d4c866192d343fb81dc89111 (diff) | |
| download | guix-fbf26cbcf3addebbbf440d4b79bca8a6aecbd257.tar guix-fbf26cbcf3addebbbf440d4b79bca8a6aecbd257.tar.gz | |
gnu: singularity: Patch 'Makefile.in' in a snippet.
* gnu/packages/linux.scm (singularity)[source](snippet, modules): New
fields.
[arguments]: Remove 'disable-install-hook' phase.
| -rw-r--r-- | gnu/packages/linux.scm | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index dd9e19aa37..e4cfc546c0 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 <ludo@gnu.org> +;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013, 2014, 2015, 2016 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2012 Nikita Karetnikov <nikita@karetnikov.org> ;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019 Mark H Weaver <mhw@netris.org> @@ -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" |