diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix index 04f4f78de45e..b115451e0818 100644 --- a/nixos/modules/services/x11/desktop-managers/xfce.nix +++ b/nixos/modules/services/x11/desktop-managers/xfce.nix @@ -129,7 +129,7 @@ in # Needed by Xfce's xinitrc script xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/ - xfce.exo + xfce4-exo xfce.garcon libxfce4ui diff --git a/pkgs/desktops/xfce/core/exo/default.nix b/pkgs/by-name/xf/xfce4-exo/package.nix similarity index 100% rename from pkgs/desktops/xfce/core/exo/default.nix rename to pkgs/by-name/xf/xfce4-exo/package.nix diff --git a/pkgs/desktops/xfce/applications/ristretto/default.nix b/pkgs/desktops/xfce/applications/ristretto/default.nix index 4c27e4d0056c..a31ad58933bd 100644 --- a/pkgs/desktops/xfce/applications/ristretto/default.nix +++ b/pkgs/desktops/xfce/applications/ristretto/default.nix @@ -8,7 +8,7 @@ pkg-config, wrapGAppsHook3, cairo, - exo, + xfce4-exo, gtk3, libexif, libxfce4ui, @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ cairo - exo + xfce4-exo glib gtk3 libexif diff --git a/pkgs/desktops/xfce/applications/xfburn/default.nix b/pkgs/desktops/xfce/applications/xfburn/default.nix index a3b816c1a65d..75e0fb873755 100644 --- a/pkgs/desktops/xfce/applications/xfburn/default.nix +++ b/pkgs/desktops/xfce/applications/xfburn/default.nix @@ -9,7 +9,7 @@ ninja, pkg-config, wrapGAppsHook3, - exo, + xfce4-exo, gst_all_1, gtk3, libburn, @@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - exo + xfce4-exo glib gst_all_1.gstreamer gst_all_1.gst-plugins-base diff --git a/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix b/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix index 9d1264a8ed1e..d539966335bd 100644 --- a/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix +++ b/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix @@ -9,7 +9,7 @@ pkg-config, wayland-scanner, wrapGAppsHook3, - exo, + xfce4-exo, gtk3, gtk-layer-shell, libX11, @@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - exo + xfce4-exo gtk3 gtk-layer-shell libX11 diff --git a/pkgs/desktops/xfce/core/thunar-volman/default.nix b/pkgs/desktops/xfce/core/thunar-volman/default.nix index 777f845b3de1..995d77c07bd7 100644 --- a/pkgs/desktops/xfce/core/thunar-volman/default.nix +++ b/pkgs/desktops/xfce/core/thunar-volman/default.nix @@ -6,7 +6,7 @@ pkg-config, xfce4-dev-tools, wrapGAppsHook3, - exo, + xfce4-exo, gtk3, libgudev, libxfce4ui, @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - exo + xfce4-exo gtk3 libgudev libxfce4ui diff --git a/pkgs/desktops/xfce/core/thunar/default.nix b/pkgs/desktops/xfce/core/thunar/default.nix index acb8c43afd8a..f52ce309c469 100644 --- a/pkgs/desktops/xfce/core/thunar/default.nix +++ b/pkgs/desktops/xfce/core/thunar/default.nix @@ -4,7 +4,7 @@ fetchFromGitLab, docbook_xsl, gettext, - exo, + xfce4-exo, gdk-pixbuf, gtk3, libexif, @@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - exo + xfce4-exo gdk-pixbuf gtk3 libX11 @@ -92,7 +92,7 @@ stdenv.mkDerivation (finalAttrs: { preFixup = '' gappsWrapperArgs+=( # https://github.com/NixOS/nixpkgs/issues/329688 - --prefix PATH : ${lib.makeBinPath [ exo ]} + --prefix PATH : ${lib.makeBinPath [ xfce4-exo ]} ) ''; diff --git a/pkgs/desktops/xfce/core/xfce4-panel/default.nix b/pkgs/desktops/xfce/core/xfce4-panel/default.nix index fe8cfc0a1b33..1b9a92bd8fc0 100644 --- a/pkgs/desktops/xfce/core/xfce4-panel/default.nix +++ b/pkgs/desktops/xfce/core/xfce4-panel/default.nix @@ -8,7 +8,7 @@ xfce4-dev-tools, wrapGAppsHook3, cairo, - exo, + xfce4-exo, garcon, gtk-layer-shell, gtk3, @@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ cairo - exo + xfce4-exo garcon gtk-layer-shell libdbusmenu-gtk3 diff --git a/pkgs/desktops/xfce/core/xfce4-session/default.nix b/pkgs/desktops/xfce/core/xfce4-session/default.nix index 9df164019861..05dbbb9848b3 100644 --- a/pkgs/desktops/xfce/core/xfce4-session/default.nix +++ b/pkgs/desktops/xfce/core/xfce4-session/default.nix @@ -7,7 +7,7 @@ xfce4-dev-tools, wrapGAppsHook3, polkit, - exo, + xfce4-exo, libxfce4util, libxfce4ui, libxfce4windowing, @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - exo + xfce4-exo gtk3 gtk-layer-shell glib diff --git a/pkgs/desktops/xfce/core/xfce4-settings/default.nix b/pkgs/desktops/xfce/core/xfce4-settings/default.nix index 2fc5f5dddd95..dbc5078e6499 100644 --- a/pkgs/desktops/xfce/core/xfce4-settings/default.nix +++ b/pkgs/desktops/xfce/core/xfce4-settings/default.nix @@ -7,7 +7,7 @@ xfce4-dev-tools, wayland-scanner, wrapGAppsHook3, - exo, + xfce4-exo, garcon, gtk3, gtk-layer-shell, @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - exo + xfce4-exo garcon glib gtk3 diff --git a/pkgs/desktops/xfce/core/xfdesktop/default.nix b/pkgs/desktops/xfce/core/xfdesktop/default.nix index 5e669868a5a8..9c8e0e2793d1 100644 --- a/pkgs/desktops/xfce/core/xfdesktop/default.nix +++ b/pkgs/desktops/xfce/core/xfdesktop/default.nix @@ -6,7 +6,7 @@ pkg-config, xfce4-dev-tools, wrapGAppsHook3, - exo, + xfce4-exo, gtk3, libxfce4ui, libxfce4util, @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - exo + xfce4-exo gtk3 libxfce4ui libxfce4util diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index 767340586773..b47923865891 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -17,8 +17,6 @@ makeScopeWithSplicing' { { #### CORE - exo = callPackage ./core/exo { }; - garcon = callPackage ./core/garcon { }; libxfce4windowing = callPackage ./core/libxfce4windowing { }; @@ -170,6 +168,7 @@ makeScopeWithSplicing' { } // lib.optionalAttrs config.allowAliases { # These aliases need to be placed outside the scope or they will shadow the attributes from parent scope. + exo = lib.warnOnInstantiate "‘xfce.exo’ was moved to top-level. Please use ‘pkgs.xfce4-exo’ directly" pkgs.xfce4-exo; # Added on 2025-12-23 libxfce4ui = lib.warnOnInstantiate "‘xfce.libxfce4ui’ was moved to top-level. Please use ‘pkgs.libxfce4ui’ directly" pkgs.libxfce4ui; # Added on 2025-12-23 libxfce4util = lib.warnOnInstantiate "‘xfce.libxfce4util’ was moved to top-level. Please use ‘pkgs.libxfce4util’ directly" pkgs.libxfce4util; # Added on 2025-12-23 xfce4-dev-tools = lib.warnOnInstantiate "‘xfce.xfce4-dev-tools’ was moved to top-level. Please use ‘pkgs.xfce4-dev-tools’ directly" pkgs.xfce4-dev-tools; # Added on 2025-12-23 diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin/default.nix index aba48cca097a..9d7419d6df74 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin/default.nix @@ -9,7 +9,7 @@ xfce4-panel, libxfce4ui, libxfce4util, - exo, + xfce4-exo, glib, gtk3, gnutls, @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { libxfce4ui libxfce4util xfce4-panel - exo + xfce4-exo glib gtk3 gnutls diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix index 46aa33786756..36bcd05f03f3 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix @@ -2,7 +2,7 @@ stdenv, lib, fetchFromGitLab, - exo, + xfce4-exo, gtk3, libcanberra, libpulseaudio, @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - exo + xfce4-exo glib gtk3 keybinder3 diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix index ca30bb25da43..9652f3e5d14b 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix @@ -8,7 +8,7 @@ pkg-config, wrapGAppsHook3, accountsservice, - exo, + xfce4-exo, garcon, glib, gtk-layer-shell, @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ accountsservice - exo + xfce4-exo garcon glib gtk-layer-shell diff --git a/pkgs/desktops/xfce/thunar-plugins/vcs/default.nix b/pkgs/desktops/xfce/thunar-plugins/vcs/default.nix index 086c259c6d85..e7ecbbd05a72 100644 --- a/pkgs/desktops/xfce/thunar-plugins/vcs/default.nix +++ b/pkgs/desktops/xfce/thunar-plugins/vcs/default.nix @@ -8,7 +8,7 @@ pkg-config, wrapGAppsHook3, thunar, - exo, + xfce4-exo, libxfce4ui, libxfce4util, gtk3, @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ thunar - exo + xfce4-exo libxfce4ui libxfce4util gtk3