diff options
| author | Artturi <Artturin@artturin.com> | 2023-01-07 17:42:25 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-07 17:42:25 +0200 |
| commit | f56de234bb0d484d0d62fc784895d61f4b78e241 (patch) | |
| tree | 69300ca3f41cd80f42b26fbc83be537da4d5cd83 /pkgs/desktops | |
| parent | 9c6be8435d9251b72a46505ab058bcef2e14b03d (diff) | |
| parent | 58fa78077c937e1879a20fc66fe7c6c57e4f75b7 (diff) | |
Merge pull request #207652 from Artturin/splicenixfmt
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/xfce/default.nix | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index 45640007e7154..2e4adb61eed1c 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -1,31 +1,17 @@ { config , lib , pkgs -, splicePackages -, newScope -, pkgsBuildBuild -, pkgsBuildHost -, pkgsBuildTarget -, pkgsHostHost -, pkgsTargetTarget +, generateSplicesForMkScope +, makeScopeWithSplicing }: 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 +makeScopeWithSplicing + (generateSplicesForMkScope "xfce") keep extra (self: |