From: "Ludovic Courtès" <ludo@gnu.org>
To: Raghav Gururajan <raghavgururajan@disroot.org>
Cc: 41083@debbugs.gnu.org
Subject: [bug#41083] gnu: xfe: Fix hard-coded fhs directories.
Date: Mon, 04 May 2020 23:04:48 +0200 [thread overview]
Message-ID: <878si7pg27.fsf@gnu.org> (raw)
In-Reply-To: <20200504131624.04c6d30e.raghavgururajan@disroot.org> (Raghav Gururajan's message of "Mon, 4 May 2020 13:16:24 -0400")
Hello!
Raghav Gururajan <raghavgururajan@disroot.org> skribis:
>>From 660f134e15438e7ee7aec1c076dca93c68e4edc6 Mon Sep 17 00:00:00 2001
> From: Raghav Gururajan <raghavgururajan@disroot.org>
> Date: Mon, 4 May 2020 13:07:02 -0400
> Subject: [PATCH] gnu: xfe: Fix hard-coded fhs directories.
>
> * gnu/packages/disk.scm (xfe): Fix hard-coded fhs directories.
> [arguments]<#:phases>['patch-xfe-paths]: Delete phase.
> [arguments]<#:phases>['patch-bin-dirs]: New phase.
> [arguments]<#:phases>['patch-share-dirs]: New phase.
> [inputs]<bash,coreutils,file,findutils>: New inputs.
Nitpick: You don’t need to mention #:phases above, and the angle
brackets are inappropriate for inputs. See ‘git log’ for examples.
> - (native-inputs
> - `(("intltool" ,intltool)
> - ("pkg-config" ,pkg-config)))
> - (inputs
> - `(("fox" ,fox)
> - ("freetype" ,freetype)
> - ("x11" ,libx11)
> - ("xcb" ,libxcb)
> - ("xcb-util" ,xcb-util)
> - ("xft" ,libxft)
> - ("xrandr" ,libxrandr)))
To reduce review time :-), it’s a good idea to avoid unnecessary
changes. In this case, you should avoid moving things around because
that makes the patch harder to read.
> + (substitute* "src/FilePanel.cpp"
> + (("/bin/sh") sh)
> + (("/usr/bin/du") du)
> + (("/usr/bin/sort") sort)
> + (("/usr/bin/cut") cut)
> + (("/usr/bin/xargs") xargs))
> + (substitute* "src/help.h"
> + (("/bin/sh") sh)
> + (("/bin/ls") ls))
> + (substitute* "src/SearchPanel.cpp"
> + (("/usr/bin/du") du)
> + (("/usr/bin/sort") sort)
> + (("/usr/bin/cut") cut)
> + (("/usr/bin/xargs") xargs))
> + (substitute* "src/startupnotification.cpp"
> + (("/bin/sh") sh))
> + (substitute* "src/xfeutils.cpp"
> + (("/usr/bin/file") file))
I think you can just define a variable like:
(coreutils (assoc-ref inputs "coreutils"))
and then use (string-append coreutils "/bin/sort") and so on, instead of
defining many variables that have a single user.
> (let*
> - ((out (assoc-ref outputs "out"))
> - (share (string-append out "/share"))
> - (xferc (string-append out "/share/xfe/xferc"))
> - (xfe-theme (string-append out "/share/xfe/icons/xfe-theme")))
> - ;; Correct path for xfe registry.
> + ((out
> + (assoc-ref outputs "out"))
> + (share
> + (string-append out "/share"))
> + (xfe
> + (string-append out "/share/xfe"))
Avoid the indentation changes (previous version was fine, although we
usually start the list of bindings on the same line as ‘let*’).
> - ;; Correct path for xfe icons.
> - (substitute* "src/xfedefs.h"
> - (((string-append
> - "~/.config/xfe/icons/xfe-theme:"
> - "/usr/local/share/xfe/icons/xfe-theme:"
> - "/usr/share/xfe/icons/xfe-theme"))
> - xfe-theme))
The ~/.config/xfe bit is going away, right?
Could you send an updated patch?
Thanks,
Ludo’.
next prev parent reply other threads:[~2020-05-04 21:05 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-04 17:16 [bug#41083] gnu: xfe: Fix hard-coded fhs directories Raghav Gururajan
2020-05-04 21:04 ` Ludovic Courtès [this message]
2020-05-05 15:44 ` Raghav Gururajan
2020-05-06 15:39 ` bug#41083: " Nicolas Goaziou
2020-05-06 15:52 ` [bug#41083] " Ludovic Courtès
2020-05-04 21:18 ` Nicolas Goaziou
2020-05-05 15:36 ` Raghav Gururajan
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=878si7pg27.fsf@gnu.org \
--to=ludo@gnu.org \
--cc=41083@debbugs.gnu.org \
--cc=raghavgururajan@disroot.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.