guix-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[bug#41083] gnu: xfe: Fix hard-coded fhs directories.


From: Raghav Gururajan
Subject: [bug#41083] gnu: xfe: Fix hard-coded fhs directories.
Date: Tue, 5 May 2020 11:36:51 -0400

Hello Nicolas!

> This indentation is unusual. I think it would be clearer to write
> 
>   (let* ((sh (string-append (assoc-ref inputs "bash")
>                             "/bin/sh"))))
> 
> I suggest the following simplification, however:
> 
>   (let* ((bash (assoc-ref inputs "bash"))
>          (coreutils (assoc-ref inputs "coreutils"))
>          (findutils (assoc-ref inputs "findutils"))
>          (file (assoc-ref inputs "file")))
>    ...)
> 
> See below for the consequences of this modification.

Thanks! I used this.

> `substitute*' accepts a list of files as its first argument. Please
> consider using the following, assuming you applied the simplification
> above.
> 
>   (with-directory-excursion "src"
>    (substitute* '("FilePanel.cpp" "help.h" "SearchPanel.cpp" ...)
>     (("/bin/sh" file) (string-append bash file))
>     (("/usr(/bin/du)" _ file) (string-append coreutils file))
>     ...))

Thanks! I used this.

> > +                 ((out
> > +                   (assoc-ref outputs "out"))  
> 
> These should be on the same line.

My new patch somehow has correct indentation.

> Wouldn't it be simpler to replace "/(usr|opt)(/local)?" with `out' in
> all files?

Thanks! I used this. But the above would conflict with "/usr/bin". So I used
"/(usr|opt)(/local)?/share".

> >      (description"XFE (X File Explorer) is a file manager for X.  It is
> > based on  
>                 ^^^^^^
>            missing space here

Fixed!

> Could you send an updated patch?

Please find updated patch attached with this email.

Regards,
RG.

Attachment: 0001-gnu-xfe-Fix-hard-coded-fhs-directories.patch
Description: Text Data


reply via email to

[Prev in Thread] Current Thread [Next in Thread]