cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

xfce: run nixpkgs-fmt

Browse source 
xfce: do not use 'with self;'

using 'with' can sometimes be confusing so i prefer to not use it
This commit is contained in:
Artturin 2022-11-05 23:11:39 +02:00
parent 5568a4d25c
commit d16405fb97
1 changed files with 94 additions and 89 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
pkgs/desktops/xfce/default.nix
View file

@ -16,18 +16,23 @@ let
selfBuildHost = pkgsBuildHost.xfce;
selfBuildTarget = pkgsBuildTarget.xfce;
selfHostHost = pkgsHostHost.xfce;
selfTargetTarget = pkgsTargetTarget.xfce or {};
selfTargetTarget = pkgsTargetTarget.xfce or { };
};
keep = _self: { };
extra = _spliced0: {};
extra = _spliced0: { };
in lib.makeScopeWithSplicing
in
lib.makeScopeWithSplicing
splicePackages
newScope
otherSplices
keep
extra
(self: with self; {
(self:
let
inherit (self) callPackage;
in
{
#### NixOS support
genericUpdater = pkgs.genericUpdater;
@ -47,7 +52,7 @@ in lib.makeScopeWithSplicing
libxfce4util = callPackage ./core/libxfce4util { };
thunar = callPackage ./core/thunar {
thunarPlugins = [];
thunarPlugins = [ ];
};
thunar-volman = callPackage ./core/thunar-volman { };
@ -77,7 +82,7 @@ in lib.makeScopeWithSplicing
xfce4-appfinder = callPackage ./core/xfce4-appfinder { };
xfce4-dev-tools = callPackage ./core/xfce4-dev-tools {
mkXfceDerivation = mkXfceDerivation.override {
mkXfceDerivation = self.mkXfceDerivation.override {
xfce4-dev-tools = null;
};
};
@ -108,7 +113,7 @@ in lib.makeScopeWithSplicing
inherit (pkgs.gnome) libsoup;
};
xfdashboard = callPackage ./applications/xfdashboard {};
xfdashboard = callPackage ./applications/xfdashboard { };
xfce4-volumed-pulse = callPackage ./applications/xfce4-volumed-pulse { };
@ -180,14 +185,14 @@ in lib.makeScopeWithSplicing
xfce4-pulseaudio-plugin = callPackage ./panel-plugins/xfce4-pulseaudio-plugin { };
} // lib.optionalAttrs config.allowAliases {
} // lib.optionalAttrs config.allowAliases {
#### ALIASES
xinitrc = xfce4-session.xinitrc; # added 2019-11-04
xinitrc = self.xfce4-session.xinitrc; # added 2019-11-04
thunar-bare = thunar.override { thunarPlugins = []; }; # added 2019-11-04
thunar-bare = self.thunar.override { thunarPlugins = [ ]; }; # added 2019-11-04
}) // lib.optionalAttrs config.allowAliases {
}) // lib.optionalAttrs config.allowAliases {
#### Legacy aliases. They need to be outside the scope or they will shadow the attributes from parent scope.
terminal = throw "xfce.terminal has been removed, use xfce.xfce4-terminal instead"; # added 2022-05-24