diff --git a/doc/hooks/xfce4-dev-tools.section.md b/doc/hooks/xfce4-dev-tools.section.md index 6c0d54a0b005..a18295f4db67 100644 --- a/doc/hooks/xfce4-dev-tools.section.md +++ b/doc/hooks/xfce4-dev-tools.section.md @@ -1,4 +1,4 @@ -# `xfce.xfce4-dev-tools` {#xfce4-dev-tools} +# `xfce4-dev-tools` {#xfce4-dev-tools} This setup hook attempts to run `xdt-autogen` in `xdtAutogenPhase`, which is part of `preConfigurePhases`. diff --git a/pkgs/by-name/li/lightdm-gtk-greeter/package.nix b/pkgs/by-name/li/lightdm-gtk-greeter/package.nix index b6b62599d139..1279d447353a 100644 --- a/pkgs/by-name/li/lightdm-gtk-greeter/package.nix +++ b/pkgs/by-name/li/lightdm-gtk-greeter/package.nix @@ -9,7 +9,7 @@ linkFarm, wrapGAppsHook3, gtk3, - xfce, + xfce4-dev-tools, at-spi2-core, librsvg, hicolor-icon-theme, @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ pkg-config intltool - xfce.xfce4-dev-tools + xfce4-dev-tools wrapGAppsHook3 ]; diff --git a/pkgs/by-name/pr/pragha/package.nix b/pkgs/by-name/pr/pragha/package.nix index 067359851eb7..5e92f657a67f 100644 --- a/pkgs/by-name/pr/pragha/package.nix +++ b/pkgs/by-name/pr/pragha/package.nix @@ -35,6 +35,7 @@ libmtp, withMtp ? false, # experimental xfce, + xfce4-dev-tools, withXfce4ui ? false, totem-pl-parser, withTotemPlParser ? false, @@ -59,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ intltool pkg-config - xfce.xfce4-dev-tools + xfce4-dev-tools desktop-file-utils installShellFiles libsForQt5.wrapQtAppsHook diff --git a/pkgs/desktops/xfce/core/xfce4-dev-tools/default.nix b/pkgs/by-name/xf/xfce4-dev-tools/package.nix similarity index 100% rename from pkgs/desktops/xfce/core/xfce4-dev-tools/default.nix rename to pkgs/by-name/xf/xfce4-dev-tools/package.nix diff --git a/pkgs/desktops/xfce/core/xfce4-dev-tools/setup-hook.sh b/pkgs/by-name/xf/xfce4-dev-tools/setup-hook.sh similarity index 100% rename from pkgs/desktops/xfce/core/xfce4-dev-tools/setup-hook.sh rename to pkgs/by-name/xf/xfce4-dev-tools/setup-hook.sh diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index 50f81008705a..f1d1fb001a37 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -59,8 +59,6 @@ makeScopeWithSplicing' { xfce4-appfinder = callPackage ./core/xfce4-appfinder { }; - xfce4-dev-tools = callPackage ./core/xfce4-dev-tools { }; - #### APPLICATIONS catfish = callPackage ./applications/catfish { }; @@ -176,3 +174,7 @@ makeScopeWithSplicing' { } ); } +// lib.optionalAttrs config.allowAliases { + # These aliases need to be placed outside the scope or they will shadow the attributes from parent scope. + 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 +}