diff options
author | Silvan Mosberger <github@infinisil.com> | 2023-07-28 23:04:09 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-07-28 23:04:09 +0200 |
commit | a0b8caf3bc21878b22411aaca1979ce60eeebace (patch) | |
tree | a84d8aca3a42347893ede50f2e49377fe6b88f67 /pkgs/desktops/xfce | |
parent | 49b4b4e8725fa0791d3a3c40bd7ea15b5ce7ff8f (diff) |
Revert "lib.customisation: uncurry makeScopeWithSplicing"
Diffstat (limited to 'pkgs/desktops/xfce')
-rw-r--r-- | pkgs/desktops/xfce/default.nix | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index 1593deca9c358..5dc21338a72cb 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -5,9 +5,16 @@ , makeScopeWithSplicing }: -makeScopeWithSplicing { - otherSplices = generateSplicesForMkScope "xfce"; - f = (self: +let + keep = _self: { }; + extra = _spliced0: { }; + +in +makeScopeWithSplicing + (generateSplicesForMkScope "xfce") + keep + extra + (self: let inherit (self) callPackage; in @@ -170,5 +177,4 @@ makeScopeWithSplicing { thunar-bare = self.thunar.override { thunarPlugins = [ ]; }; # added 2019-11-04 xfce4-hardware-monitor-plugin = throw "xfce.xfce4-hardware-monitor-plugin has been removed: abandoned by upstream and does not build"; # added 2023-01-15 - }); -} + }) |