libxfce4ui: Move to top-level
This commit is contained in:
@@ -131,7 +131,7 @@ in
|
||||
|
||||
xfce.exo
|
||||
xfce.garcon
|
||||
xfce.libxfce4ui
|
||||
libxfce4ui
|
||||
|
||||
xfce.mousepad
|
||||
xfce.parole
|
||||
|
||||
@@ -34,7 +34,7 @@
|
||||
withGudev ? false, # experimental
|
||||
libmtp,
|
||||
withMtp ? false, # experimental
|
||||
xfce,
|
||||
libxfce4ui,
|
||||
xfce4-dev-tools,
|
||||
withXfce4ui ? false,
|
||||
totem-pl-parser,
|
||||
@@ -97,7 +97,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
++ lib.optional withGlyr glyr
|
||||
++ lib.optional withLibsoup libsoup_2_4
|
||||
++ lib.optional withMtp libmtp
|
||||
++ lib.optional withXfce4ui xfce.libxfce4ui
|
||||
++ lib.optional withXfce4ui libxfce4ui
|
||||
++ lib.optional withTotemPlParser totem-pl-parser
|
||||
# ++ lib.optional withGrilo grilo
|
||||
# ++ lib.optional withRygel rygel
|
||||
|
||||
@@ -21,8 +21,6 @@ makeScopeWithSplicing' {
|
||||
|
||||
garcon = callPackage ./core/garcon { };
|
||||
|
||||
libxfce4ui = callPackage ./core/libxfce4ui { };
|
||||
|
||||
libxfce4windowing = callPackage ./core/libxfce4windowing { };
|
||||
|
||||
thunar-unwrapped = callPackage ./core/thunar { };
|
||||
@@ -172,6 +170,7 @@ makeScopeWithSplicing' {
|
||||
}
|
||||
// lib.optionalAttrs config.allowAliases {
|
||||
# These aliases need to be placed outside the scope or they will shadow the attributes from parent scope.
|
||||
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
|
||||
xfconf = lib.warnOnInstantiate "‘xfce.xfconf’ was moved to top-level. Please use ‘pkgs.xfconf’ directly" pkgs.xfconf; # Added on 2025-12-23
|
||||
|
||||
Reference in New Issue
Block a user