mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-24 21:38:07 -05:00
gnu: xfce: Don't wrap 'startxfce4'.
The necessary environment variables are set by 'etc/profile' now. * gnu/packages/xfce.scm (xfce)[build-system]: Use 'trivial-build-system'. [arguments]: Simplify.
This commit is contained in:
parent
5e8276dcf4
commit
6150b5c780
1 changed files with 3 additions and 24 deletions
|
@ -24,7 +24,7 @@ (define-module (gnu packages xfce)
|
||||||
#:use-module (guix download)
|
#:use-module (guix download)
|
||||||
#:use-module (guix utils)
|
#:use-module (guix utils)
|
||||||
#:use-module (guix build-system gnu)
|
#:use-module (guix build-system gnu)
|
||||||
#:use-module (guix build-system glib-or-gtk)
|
#:use-module (guix build-system trivial)
|
||||||
#:use-module (gnu packages)
|
#:use-module (gnu packages)
|
||||||
#:use-module (gnu packages pkg-config)
|
#:use-module (gnu packages pkg-config)
|
||||||
#:use-module (gnu packages glib)
|
#:use-module (gnu packages glib)
|
||||||
|
@ -690,29 +690,8 @@ (define-public xfce
|
||||||
(name "xfce")
|
(name "xfce")
|
||||||
(version (package-version xfce4-session))
|
(version (package-version xfce4-session))
|
||||||
(source #f)
|
(source #f)
|
||||||
(build-system glib-or-gtk-build-system)
|
(build-system trivial-build-system)
|
||||||
(arguments
|
(arguments '(#:builder (mkdir %output)))
|
||||||
'(#:modules ((guix build gnu-build-system)
|
|
||||||
(guix build glib-or-gtk-build-system)
|
|
||||||
(guix build utils)
|
|
||||||
(srfi srfi-26))
|
|
||||||
#:phases
|
|
||||||
(alist-replace
|
|
||||||
'install
|
|
||||||
(lambda* (#:key outputs #:allow-other-keys)
|
|
||||||
(let* ((out (assoc-ref outputs "out"))
|
|
||||||
(bin (string-append out "/bin"))
|
|
||||||
(prog (string-append bin "/startxfce4")))
|
|
||||||
(mkdir-p bin)
|
|
||||||
(symlink (string-append
|
|
||||||
(assoc-ref %build-inputs "xfce4-session")
|
|
||||||
"/bin/startxfce4")
|
|
||||||
prog)
|
|
||||||
(wrap-program prog
|
|
||||||
;; For xfce4-panel plugins.
|
|
||||||
`("X_XFCE4_LIB_DIRS" = ,(list (getenv "X_XFCE4_LIB_DIRS"))))))
|
|
||||||
(map (cut assq <> %standard-phases)
|
|
||||||
'(set-paths install glib-or-gtk-wrap)))))
|
|
||||||
(propagated-inputs
|
(propagated-inputs
|
||||||
`(("exo" ,exo)
|
`(("exo" ,exo)
|
||||||
("garcon" ,garcon)
|
("garcon" ,garcon)
|
||||||
|
|
Loading…
Reference in a new issue