Merge pull request #199769 from Artturin/xfcesplicingcross

xfce: fix cross-compilation by using makeScopeWithSplicing

pkgs/desktops/xfce/default.nix

@@ -1,6 +1,38 @@
-{ config, lib, pkgs }:
+{ config
+, lib
+, pkgs
+, splicePackages
+, newScope
+, pkgsBuildBuild
+, pkgsBuildHost
+, pkgsBuildTarget
+, pkgsHostHost
+, pkgsTargetTarget
+}:
 
-lib.makeScope pkgs.newScope (self: with self; {
+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:
+    let
+      inherit (self) callPackage;
+    in
+    {
       #### NixOS support
 
       genericUpdater = pkgs.genericUpdater;
@@ -50,7 +82,7 @@ lib.makeScope pkgs.newScope (self: with self; {
       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;
         };
       };
@@ -156,9 +188,9 @@ lib.makeScope pkgs.newScope (self: with self; {
     } // 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.