diff mbox series

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

Message ID 20200505114444.5cf4081f.raghavgururajan@disroot.org
State Accepted
Headers show
Series [bug#41083] gnu: xfe: Fix hard-coded fhs directories. | expand

Checks

Context Check Description
cbaines/comparison success View comparision
cbaines/git branch success View Git branch
cbaines/applying patch fail View Laminar job

Commit Message

Raghav Gururajan May 5, 2020, 3:44 p.m. UTC 
Hello Ludo!

> Nitpick: You don’t need to mention #:phases above, and the angle
> brackets are inappropriate for inputs.  See ‘git log’ for examples.

Fixed!
 
> 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.

Sorry about that. I was making the definition consistent with the order
mentioned in
https://guix.gnu.org/manual/en/html_node/Defining-Packages.html#Defining-Packages

> 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.
>
> Avoid the indentation changes (previous version was fine, although we
> usually start the list of bindings on the same line as ‘let*’).

I have changed some things in my new patch.

> The ~/.config/xfe bit is going away, right?

No. It is not necessary to remove it, as it is only an alternative dir. Xfe now
looks in 'out', if ~/.config/xfe doesn't exist. :-) 

> Could you send an updated patch?

Please find the updated patch attached with this email.

Regards,
RG.

Comments

Nicolas Goaziou May 6, 2020, 3:39 p.m. UTC | #1 
Hello,

Raghav Gururajan <raghavgururajan@disroot.org> writes:

> Please find the updated patch attached with this email.

Thank you. I applied it, with the following few cosmetics changes.

> Subject: [PATCH] gnu: xfe: Fix hard-coded fhs directories.
>
> * gnu/packages/disk.scm (xfe):
> [arguments]: Remove phase 'patch-xfe-paths.
> [arguments]: Add phases 'patch-bin-dirs and 'patch-share-dirs.

I merged these two lines.

> +           (lambda* (#:key inputs #:allow-other-keys)
> +             (let*
> +                 ((bash (assoc-ref inputs "bash"))

I moved the bash binding onto the same line as let*.

> +           (lambda* (#:key outputs #:allow-other-keys)
> +             (let*
> +                 ((out (assoc-ref outputs "out"))

Ditto.

Regards,
Ludovic Courtès May 6, 2020, 3:52 p.m. UTC | #2 
Hi,

Raghav Gururajan <raghavgururajan@disroot.org> skribis:

>>From e7032ff0032bbdbaefa8505f9f882fc6df58adaf Mon Sep 17 00:00:00 2001
> From: Raghav Gururajan <raghavgururajan@disroot.org>
> Date: Tue, 5 May 2020 11:22:01 -0400
> Subject: [PATCH] gnu: xfe: Fix hard-coded fhs directories.
>
> * gnu/packages/disk.scm (xfe):
> [arguments]: Remove phase 'patch-xfe-paths.
> [arguments]: Add phases 'patch-bin-dirs and 'patch-share-dirs.
> [inputs]: Add bash, coreutils, file and findutils.

Great.  Applied, thanks!

(And thanks to Nicolas as well.)

Ludo’.
diff mbox series

Patch

From e7032ff0032bbdbaefa8505f9f882fc6df58adaf Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Tue, 5 May 2020 11:22:01 -0400
Subject: [PATCH] gnu: xfe: Fix hard-coded fhs directories.

* gnu/packages/disk.scm (xfe):
[arguments]: Remove phase 'patch-xfe-paths.
[arguments]: Add phases 'patch-bin-dirs and 'patch-share-dirs.
[inputs]: Add bash, coreutils, file and findutils.
---
 gnu/packages/disk.scm | 66 +++++++++++++++++++++++++------------------
 1 file changed, 38 insertions(+), 28 deletions(-)

diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm
index 484126a3ea..e018df33fb 100644
--- a/gnu/packages/disk.scm
+++ b/gnu/packages/disk.scm
@@ -48,6 +48,7 @@ 
   #:use-module (gnu packages documentation)
   #:use-module (gnu packages elf)
   #:use-module (gnu packages file-systems)
+  #:use-module (gnu packages file)
   #:use-module (gnu packages fontutils)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages glib)
@@ -940,45 +941,54 @@  since they are better handled by external tools.")
        (sha256
         (base32 "1fl51k5jm2vrfc2g66agbikzirmp0yb0lqhmsssixfb4mky3hpzs"))))
     (build-system gnu-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'patch-bin-dirs
+           (lambda* (#:key inputs #:allow-other-keys)
+             (let*
+                 ((bash (assoc-ref inputs "bash"))
+                  (coreutils (assoc-ref inputs "coreutils"))
+                  (findutils (assoc-ref inputs "findutils"))
+                  (file-prog (assoc-ref inputs "file")))
+               (with-directory-excursion "src"
+                 (substitute* '("FilePanel.cpp" "help.h" "SearchPanel.cpp"
+                                "startupnotification.cpp" "xfeutils.cpp")
+                   (("/bin/sh" file) (string-append bash file))
+                   (("/bin/ls" file) (string-append coreutils file))
+                   (("/usr(/bin/du)" _ file) (string-append coreutils file))
+                   (("/usr(/bin/sort)" _ file) (string-append coreutils file))
+                   (("/usr(/bin/cut)" _ file) (string-append coreutils file))
+                   (("/usr(/bin/xargs)" _ file) (string-append findutils file))
+                   (("/usr(/bin/file)" _ file) (string-append file-prog file))))
+               #t)))
+         (add-after 'unpack 'patch-share-dirs
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let*
+                 ((out (assoc-ref outputs "out"))
+                  (share (string-append out "/share")))
+               (with-directory-excursion "src"
+                 (substitute* '("foxhacks.cpp" "help.h" "xfedefs.h"
+                                "XFileExplorer.cpp")
+                   (("/(usr|opt)(/local)?/share") share)))
+               #t))))))
     (native-inputs
      `(("intltool" ,intltool)
        ("pkg-config" ,pkg-config)))
     (inputs
-     `(("fox" ,fox)
+     `(("bash" ,bash)
+       ("coreutils" ,coreutils)
+       ("file" ,file)
+       ("findutils" ,findutils)
+       ("fox" ,fox)
        ("freetype" ,freetype)
        ("x11" ,libx11)
        ("xcb" ,libxcb)
        ("xcb-util" ,xcb-util)
        ("xft" ,libxft)
        ("xrandr" ,libxrandr)))
-    (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'patch-xfe-paths
-           (lambda* (#:key outputs #:allow-other-keys)
-             (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.
-               (substitute* "src/foxhacks.cpp"
-                 (("/etc:/usr/share:/usr/local/share") share))
-               ;; Correct path for xfe configuration.
-               (substitute* "src/XFileExplorer.cpp"
-                 (("/usr/share/xfe/xferc") xferc)
-                 (("/usr/local/share/xfe/xferc") xferc)
-                 (("/opt/local/share/xfe/xferc") xferc))
-               ;; 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))
-               #t))))))
     (synopsis "File Manager for X-Based Graphical Systems")
-    (description"XFE (X File Explorer) is a file manager for X.  It is based on
+    (description "XFE (X File Explorer) is a file manager for X.  It is based on
 the popular but discontinued, X Win Commander.  It aims to be the file manager
 of choice for all light thinking Unix addicts!")
     (home-page "http://roland65.free.fr/xfe/")
-- 
2.26.2