xfce: fix cross-compilation by using makeScopeWithSplicing

1 files changed, 30 insertions, 3 deletions

diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix
index 7cbf02fef8dd7..6f47cea9ffa3f 100644
--- a/pkgs/desktops/xfce/default.nix
+++ b/pkgs/desktops/xfce/default.nix
@@ -1,6 +1,33 @@
-{ config, lib, pkgs }:
-
-lib.makeScope pkgs.newScope (self: with self; {
+{ config
+, lib
+, pkgs
+, splicePackages
+, newScope
+, pkgsBuildBuild
+, pkgsBuildHost
+, pkgsBuildTarget
+, pkgsHostHost
+, pkgsTargetTarget
+}:
+
+let
+  otherSplices = {
+    selfBuildBuild = pkgsBuildBuild.xfce;
+    selfBuildHost = pkgsBuildHost.xfce;
+    selfBuildTarget = pkgsBuildTarget.xfce;
+    selfHostHost = pkgsHostHost.xfce;
+    selfTargetTarget = pkgsTargetTarget.xfce or {};
+  };
+  keep = _self: { };
+  extra = _spliced0: {};
+
+in lib.makeScopeWithSplicing
+  splicePackages
+  newScope
+  otherSplices
+  keep
+  extra
+  (self: with self; {
   #### NixOS support
 
   genericUpdater = pkgs.genericUpdater;