mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-06-05 21:03:40 +00:00
xfce4-dev-tools: Move to top-level
This commit is contained in:
@@ -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`.
|
||||
|
||||
|
||||
@@ -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
|
||||
];
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user