diff --git a/pkgs/by-name/bu/budgie-desktop/package.nix b/pkgs/by-name/bu/budgie-desktop/package.nix index ac014cfcd01a..29e729bfa3d3 100644 --- a/pkgs/by-name/bu/budgie-desktop/package.nix +++ b/pkgs/by-name/bu/budgie-desktop/package.nix @@ -41,7 +41,7 @@ upower, vala, validatePkgConfig, - xfce, + libxfce4windowing, wrapGAppsHook3, zenity, }: @@ -110,7 +110,7 @@ stdenv.mkDerivation (finalAttrs: { sassc udev upower - xfce.libxfce4windowing + libxfce4windowing ]; propagatedBuildInputs = [ diff --git a/pkgs/by-name/bu/budgie-media-player-applet/package.nix b/pkgs/by-name/bu/budgie-media-player-applet/package.nix index 7315b6065be6..630103b5a5dc 100644 --- a/pkgs/by-name/bu/budgie-media-player-applet/package.nix +++ b/pkgs/by-name/bu/budgie-media-player-applet/package.nix @@ -8,7 +8,7 @@ ninja, nix-update-script, python3Packages, - xfce, + libxfce4windowing, }: stdenv.mkDerivation (finalAttrs: { @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ glib gtk3 - xfce.libxfce4windowing + libxfce4windowing ]; pythonPath = with python3Packages; [ diff --git a/pkgs/desktops/xfce/core/libxfce4windowing/default.nix b/pkgs/by-name/li/libxfce4windowing/package.nix similarity index 100% rename from pkgs/desktops/xfce/core/libxfce4windowing/default.nix rename to pkgs/by-name/li/libxfce4windowing/package.nix diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index b47923865891..db4afc7a3660 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -19,8 +19,6 @@ makeScopeWithSplicing' { garcon = callPackage ./core/garcon { }; - libxfce4windowing = callPackage ./core/libxfce4windowing { }; - thunar-unwrapped = callPackage ./core/thunar { }; thunar = callPackage ./core/thunar/wrapper.nix { }; @@ -171,6 +169,7 @@ makeScopeWithSplicing' { 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 + libxfce4windowing = lib.warnOnInstantiate "‘xfce.libxfce4windowing’ was moved to top-level. Please use ‘pkgs.libxfce4windowing’ directly" pkgs.libxfce4windowing; # 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 xfconf = lib.warnOnInstantiate "‘xfce.xfconf’ was moved to top-level. Please use ‘pkgs.xfconf’ directly" pkgs.xfconf; # Added on 2025-12-23 }