Commit d16405fb authored by Artturin's avatar Artturin
Browse files

xfce: run nixpkgs-fmt

xfce: do not use 'with self;'

using 'with' can sometimes be confusing so i prefer to not use it
parent 5568a4d2
Loading
Loading
Loading
Loading
+94 −89
Original line number Diff line number Diff line
@@ -21,13 +21,18 @@ let
  keep = _self: { };
  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;
@@ -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;
        };
      };
@@ -183,9 +188,9 @@ in lib.makeScopeWithSplicing
    } // 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 {
  #### Legacy aliases. They need to be outside the scope or they will shadow the attributes from parent scope.