mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-01-18 13:36:36 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: xfce4-session: Patch paths to gdbus, xrdb and xmodmap.

Browse source 
Partly fixes <https://issues.guix.gnu.org/75288>.

* gnu/packages/xfce.scm (xfce4-session)[inputs]: Add glib:bin, xmodmap and xrdb.
[arguments]: Add 'patch-command-paths phase.

Change-Id: I8b6fa52a67856320fe0a665b591282fb5a570427
This commit is contained in:
宋文武 2025-01-12 13:15:45 +08:00
parent d3f6610f85
commit 11d0bdad96
No known key found for this signature in database
GPG key ID: D415BF253B515976
1 changed files with 27 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
gnu/packages/xfce.scm
View file

@ -720,13 +720,31 @@ (define-public xfce4-session
#t))))
(build-system gnu-build-system)
(arguments
'(#:configure-flags
(list "--enable-maintainer-mode" ;for xfce4-session-settings_ui.h
(string-append "--with-xsession-prefix=" %output)
(string-append "--with-wayland-session-prefix=" %output))
(list
#:configure-flags
#~(list "--enable-maintainer-mode" ;for xfce4-session-settings_ui.h
(string-append "--with-xsession-prefix=" #$output)
(string-append "--with-wayland-session-prefix=" #$output))
;; Disable icon cache update.
#:make-flags
'("gtk_update_icon_cache=true")))
#~(list "gtk_update_icon_cache=true")
#:phases
#~(modify-phases %standard-phases
(add-after 'install 'patch-command-paths
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))
(search-command (lambda (cmd)
(search-input-file
inputs
(string-append "bin/" cmd)))))
(substitute* (string-append out "/bin/xflock4")
(("gdbus call")
(string-append (search-command "gdbus") " call")))
(substitute* (string-append out "/etc/xdg/xfce4/xinitrc")
(("[|] xrdb")
(string-append "| " (search-command "xrdb")))
(("&& xmodmap")
(string-append "&& " (search-command "xmodmap"))))))))))
(native-inputs
(list xfce4-dev-tools))
(inputs
@ -737,7 +755,10 @@ (define-public xfce4-session
libsm
libwnck
libxfce4ui
libxfce4windowing))
libxfce4windowing
(list glib "bin")
xmodmap
xrdb))
(home-page "https://docs.xfce.org/xfce/xfce4-session/")
(synopsis "Xfce session manager")
(description