From: Mark H Weaver <mhw@netris.org>
To: Alex Kost <alezost@gmail.com>
Cc: guix-devel@gnu.org
Subject: Re: [PATCH] gnu: pdf: Fix installing desktop files of zathura packages.
Date: Tue, 07 Jul 2015 11:07:07 -0400 [thread overview]
Message-ID: <87zj380zxg.fsf@netris.org> (raw)
In-Reply-To: <87twtgicz4.fsf@gmail.com> (Alex Kost's message of "Tue, 07 Jul 2015 11:33:19 +0300")
Alex Kost <alezost@gmail.com> writes:
> I've noticed that the packages for zathura plugins install .desktop
> files into:
>
> /gnu/store/…/usr/share/applications/ instead of:
> /gnu/store/…/share/applications/
>
> The attached patch fixes it.
Good catch, but see below:
> From 74efced6076ef28b321cb2a6a69344f55b714b59 Mon Sep 17 00:00:00 2001
> From: Alex Kost <alezost@gmail.com>
> Date: Tue, 7 Jul 2015 11:17:06 +0300
> Subject: [PATCH] gnu: pdf: Fix installing desktop files of zathura packages.
>
> * gnu/packages/pdf.scm (zathura-cb, zathura-ps, zathura-djvu,
> zathura-pdf-poppler): Add PREFIX to 'make-flags' to install
> ".desktop" files into "share", not "usr/share".
> ---
> gnu/packages/pdf.scm | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
> index 82e8c88..0e8817d 100644
> --- a/gnu/packages/pdf.scm
> +++ b/gnu/packages/pdf.scm
> @@ -173,7 +173,7 @@
> (arguments
> `(#:make-flags
> `(,(string-append "DESTDIR=" (assoc-ref %outputs "out"))
> - "PLUGINDIR=/lib/zathura" "CC=gcc")
> + "PREFIX=" "PLUGINDIR=/lib/zathura" "CC=gcc")
It would be better to leave DESTDIR empty and set PREFIX=<%output>, so:
> - `(,(string-append "DESTDIR=" (assoc-ref %outputs "out"))
> + `(,(string-append "PREFIX=" (assoc-ref %outputs "out"))
There is a conceptual difference between PREFIX and DESTDIR: at install
time, files are copied to ${DESTDIR}${PREFIX}, and then at run time
files are expected to be at ${PREFIX}. So in general, we don't want to
use DESTDIR in Guix, and we want to set PREFIX to the output directory.
Thanks!
Mark
next prev parent reply other threads:[~2015-07-07 15:07 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-07 8:33 [PATCH] gnu: pdf: Fix installing desktop files of zathura packages Alex Kost
2015-07-07 8:43 ` Paul van der Walt
2015-07-07 17:40 ` Alex Kost
2015-07-07 15:07 ` Mark H Weaver [this message]
2015-07-07 17:39 ` Alex Kost
2015-07-07 18:36 ` Mark H Weaver
2015-07-07 19:25 ` Alex Kost
2015-07-07 19:59 ` Mark H Weaver
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87zj380zxg.fsf@netris.org \
--to=mhw@netris.org \
--cc=alezost@gmail.com \
--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 external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.