(xfconf, libxfce4ui, xfce4-panel, xfce4-whiskermenu-plugin, xfce,
xfce4-screensaver): Remove input labels.
gnu/packages/xfce.scm | 130 +++++++++++++++++++++---------------------
1 file changed, 65 insertions(+), 65 deletions(-)
Toggle diff (181 lines)
diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index d22a0dc84f..150d21226b 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -164,12 +164,12 @@ (define-public xfconf
(string-append etc "/bash_completion.d"))))))
- `(("pkg-config" ,pkg-config)
- ("glib:bin" ,glib "bin") ;; for gdbus-codegen
- ("gobject-introspection" ,gobject-introspection)
+ `(,glib "bin") ;; for gdbus-codegen
;; libxfconf-0.pc refers to all these.
@@ -201,10 +201,10 @@ (define-public libxfce4ui
(list pkg-config intltool gobject-introspection))
- `(("gtk+-3" ,gtk+) ; required by libxfce4ui-2.pc
- ;; libxfce4kbd-private-3.pc refers to all these.
- ("libxfce4util" ,libxfce4util)
+ (list gtk+ ; required by libxfce4ui-2.pc
+ ;; libxfce4kbd-private-3.pc refers to all these.
(inputs (list libsm libice startup-notification))
(home-page "https://www.xfce.org/")
(synopsis "Widgets library for Xfce")
@@ -415,20 +415,20 @@ (define-public xfce4-panel
(search-input-directory inputs "share/zoneinfo"))))))))
- `(("pkg-config" ,pkg-config)
- ("glib:bin" ,glib "bin")))
- `(("gtk+-3" ,gtk+) ; required by libxfce4panel-2.0.pc
- ("libxfce4util" ,libxfce4util))) ; required by libxfce4panel-2.0.pc
+ (list gtk+ ; required by libxfce4panel-2.0.pc
+ libxfce4util)) ; required by libxfce4panel-2.0.pc
- `(("tzdata" ,tzdata) ;; For fix-tzdata-path phase only.
- ("libxfce4ui" ,libxfce4ui)))
+ (list tzdata ;; For fix-tzdata-path phase only.
(list (search-path-specification
(variable "X_XFCE4_LIB_DIRS")
@@ -548,12 +548,12 @@ (define-public xfce4-whiskermenu-plugin
(list pkg-config intltool))
- `(("xfce4-panel" ,xfce4-panel)
- ("gettext" ,gettext-minimal)
- ("libxfce4ui" ,libxfce4ui)))
@@ -944,31 +944,31 @@ (define-public xfce
- ("gnome-icon-theme" ,gnome-icon-theme)
- ("gtk-xfce-engine" ,gtk-xfce-engine)
- ("hicolor-icon-theme" ,hicolor-icon-theme)
- ("mate-polkit-for-xfce" ,mate-polkit-for-xfce)
- ("ristretto" ,ristretto)
- ("shared-mime-info" ,shared-mime-info)
- ("thunar-volman" ,thunar-volman)
- ("xfce4-appfinder" ,xfce4-appfinder)
- ("xfce4-panel" ,xfce4-panel)
- ("xfce4-power-manager" ,xfce4-power-manager)
- ("xfce4-session" ,xfce4-session)
- ("xfce4-settings" ,xfce4-settings)
- ("xfce4-terminal" ,xfce4-terminal)
- ("xfdesktop" ,xfdesktop)
- ("xfce4-battery-plugin" ,xfce4-battery-plugin)
- ("xfce4-clipman-plugin" ,xfce4-clipman-plugin)
- ("xfce4-pulseaudio-plugin" ,xfce4-pulseaudio-plugin)
- ("xfce4-xkb-plugin" ,xfce4-xkb-plugin)))
+ xfce4-pulseaudio-plugin
;; Default font that applications such as IceCat require.
@@ -1261,19 +1261,19 @@ (define-public xfce4-screensaver
(string-append "DBUS_SESSION_SERVICE_DIR="
- `(("pkg-config" ,pkg-config)
- ("glib" ,glib) ; glib-compile-schemas
- ("glib:bin" ,glib "bin"))) ; glib-compile-schemas
+ glib ; glib-compile-schemas
+ `(,glib "bin"))) ; glib-compile-schemas
- `(("dbus-glib" ,dbus-glib)
- ("libux-pam" ,linux-pam)
- ("libxklavier" ,libxklavier)
- ("libxscrnsaver" ,libxscrnsaver)
(home-page "https://docs.xfce.org/apps/screensaver/start")
(synopsis "Screensaver for the Xfce desktop")