From: Mark H Weaver <mhw@netris.org>
To: David Thompson <dthompson2@worcester.edu>
Cc: guix-devel@gnu.org
Subject: Re: [PATCHES] gnu: nginx: Clean up installation directories.
Date: Sun, 05 Apr 2015 15:58:34 -0400 [thread overview]
Message-ID: <871tjy5out.fsf@netris.org> (raw)
In-Reply-To: <87oan2fs4m.fsf@fsf.org> (David Thompson's message of "Sun, 05 Apr 2015 12:37:45 -0400")
David Thompson <dthompson2@worcester.edu> writes:
> From 81adae7d0de6e6d9213b81dc6a8747bfc6487420 Mon Sep 17 00:00:00 2001
> From: David Thompson <dthompson2@worcester.edu>
> Date: Sun, 5 Apr 2015 12:31:54 -0400
> Subject: [PATCH 1/2] gnu: nginx: Use modify-phases syntax.
Okay.
> From 6757351ece10cafc5e9c04f5778e6ba6334979d5 Mon Sep 17 00:00:00 2001
> From: David Thompson <dthompson2@worcester.edu>
> Date: Sun, 5 Apr 2015 12:34:45 -0400
> Subject: [PATCH 2/2] gnu: nginx: Clean up installation directories.
>
> * gnu/packages/web.scm (nginx): Add 'fix-root-dirs' phase.
> ---
> gnu/packages/web.scm | 20 +++++++++++++++++++-
> 1 file changed, 19 insertions(+), 1 deletion(-)
>
>
> diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
> index 031bbca..c41e9ba 100644
> --- a/gnu/packages/web.scm
> +++ b/gnu/packages/web.scm
> @@ -137,7 +137,25 @@ and its related documentation.")
> (setenv "CC" "gcc")
> (format #t "environment variable `CC' set to `gcc'~%")
> (format #t "configure flags: ~s~%" flags)
> - (zero? (apply system* "./configure" flags))))))))
> + (zero? (apply system* "./configure" flags)))))
> + (add-after install fix-root-dirs
> + (lambda* (#:key outputs #:allow-other-keys)
> + ;; 'make install' puts things in strange places, so we need to
> + ;; clean it up ourselves.
> + (let* ((out (assoc-ref outputs "out"))
> + (share (string-append out "/share/nginx")))
> + ;; This directory is empty, so get rid of it.
> + (rmdir (string-append out "/logs"))
> + ;; Example configuration and HTML files belong in
> + ;; /share.
> + (mkdir-p share)
> + (rename-file (string-append out "/conf")
> + (string-append share "/conf"))
> + (rename-file (string-append out "/html")
> + (string-append share "/html"))
Okay.
> + ;; No reason to use /sbin
> + (rename-file (string-append out "/sbin")
> + (string-append out "/bin"))))))))
I would prefer to avoid diverging from upstream without good reason, and
I don't see a good reason for this change.
What do you think?
Okay to push everything here except for the /sbin -> /bin change.
Thanks!
Mark
next prev parent reply other threads:[~2015-04-05 19:58 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-05 16:37 [PATCHES] gnu: nginx: Clean up installation directories David Thompson
2015-04-05 17:00 ` David Thompson
2015-04-05 20:02 ` Mark H Weaver
2015-04-05 20:11 ` David Thompson
2015-04-05 19:58 ` Mark H Weaver [this message]
2015-04-05 20:16 ` David Thompson
2015-04-05 20:53 ` Ludovic Courtès
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=871tjy5out.fsf@netris.org \
--to=mhw@netris.org \
--cc=dthompson2@worcester.edu \
--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).