~ruther/guix-local

705a5dcb87bc742a1f9bb3c9e6501cdc435105e0 — Raghav Gururajan 6 years ago d8ccff8
gnu: xfe: Fix few more FHS directories.

* gnu/packages/disk.scm (xfe): Fix /bin and /share paths in
st/config.h and src/xfedefs.h, respectively.

Signed-off-by: Nicolas Goaziou <mail@nicolasgoaziou.fr>
1 files changed, 6 insertions(+), 3 deletions(-)

M gnu/packages/disk.scm
M gnu/packages/disk.scm => gnu/packages/disk.scm +6 -3
@@ 990,7 990,8 @@ since they are better handled by external tools.")
                    (file-prog (assoc-ref inputs "file")))
               (with-directory-excursion "src"
                 (substitute* '("FilePanel.cpp" "help.h" "SearchPanel.cpp"
                                "startupnotification.cpp" "xfeutils.cpp")
                                "startupnotification.cpp" "xfeutils.cpp"
                                "../st/config.h")
                   (("/bin/sh" file) (string-append bash file))
                   (("/bin/ls" file) (string-append coreutils file))
                   (("/usr(/bin/du)" _ file) (string-append coreutils file))


@@ 1002,11 1003,13 @@ since they are better handled by external tools.")
         (add-after 'unpack 'patch-share-dirs
           (lambda* (#:key outputs #:allow-other-keys)
             (let* ((out (assoc-ref outputs "out"))
                    (share (string-append out "/share")))
                    (share (string-append out "/share"))
                    (xfe (string-append share "/xfe")))
               (with-directory-excursion "src"
                 (substitute* '("foxhacks.cpp" "help.h" "xfedefs.h"
                                "XFileExplorer.cpp")
                   (("/(usr|opt)(/local)?/share") share)))
                   (("/(usr|opt)(/local)?/share") share)
                   (("~/.config/xfe") xfe)))
               #t))))))
    (native-inputs
     `(("intltool" ,intltool)