me
/
guix
Archived
1
0
Fork 0
Code

gnu: xfe: Fix configuration and icons. 

* gnu/packages/disk.scm (xfe)[arguments]<#:make-flags>: Remove
BASH_COMPLETION_DIR.
[arguments]<#:phases>[patch-xferc-path]: Remove phase.
[arguments]<#:phases>[patch-xfe-paths]: New phase.

Signed-off-by: Danny Milosavljevic <dannym@scratchpost.org>
master
Raghav Gururajan 2020-05-01 12:45:03 -04:00 committed by Danny Milosavljevic
parent 7e5c767705
commit 7dfc7c5398
No known key found for this signature in database
GPG Key ID: E71A35542C30BAA5
1 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
gnu/packages/disk.scm
View File

@ -936,8 +936,7 @@ since they are better handled by external tools.")
(method url-fetch) (method url-fetch)
(uri (uri
(string-append "https://sourceforge.net/projects/xfe/files/xfe/" (string-append "https://sourceforge.net/projects/xfe/files/xfe/"
version version "/xfe-" version ".tar.gz"))
"/xfe-" version ".tar.gz"))
(sha256 (sha256
(base32 "1fl51k5jm2vrfc2g66agbikzirmp0yb0lqhmsssixfb4mky3hpzs")))) (base32 "1fl51k5jm2vrfc2g66agbikzirmp0yb0lqhmsssixfb4mky3hpzs"))))
(build-system gnu-build-system) (build-system gnu-build-system)
@ -955,17 +954,29 @@ since they are better handled by external tools.")
(arguments (arguments
`(#:phases `(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'patch-xferc-path (add-after 'unpack 'patch-xfe-paths
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let*
(xferc (string-append out "/share/xfe/xferc"))) ((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" (substitute* "src/XFileExplorer.cpp"
(("/usr/share/xfe/xferc") xferc)) (("/usr/share/xfe/xferc") xferc)
#t)))) (("/usr/local/share/xfe/xferc") xferc)
#:make-flags (("/opt/local/share/xfe/xferc") xferc))
(let ((out (assoc-ref %outputs "out"))) ;; Correct path for xfe icons.
(list (string-append "BASH_COMPLETION_DIR=" out (substitute* "src/xfedefs.h"
"/share/bash-completion/completions"))))) (((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") (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 the popular but discontinued, X Win Commander. It aims to be the file manager