Re: [PATCH] gnu: pdf: Fix installing desktop files of zathura packages.

[Mark H Weaver]

Alex Kost <address@hidden> 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 <address@hidden>
> 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