From a0b8caf3bc21878b22411aaca1979ce60eeebace Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <github@infinisil.com>
Date: Fri, 28 Jul 2023 23:04:09 +0200
Subject: Revert "lib.customisation: uncurry makeScopeWithSplicing"

---
 pkgs/desktops/xfce/default.nix | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

(limited to 'pkgs/desktops/xfce')

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
-    });
-}
+    })
-- 
cgit 1.4.1