From 55460106baa016dcf674da9accd417e7893857f7 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Wed, 12 Jan 2022 20:06:25 +0800
Subject: [PATCH] gnome: switch to makeScopeWithSplicing, and remove with self

---
 pkgs/desktops/gnome/default.nix | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix
index 2b36373e2bf9f..0eb20c793a9d0 100644
--- a/pkgs/desktops/gnome/default.nix
+++ b/pkgs/desktops/gnome/default.nix
@@ -1,6 +1,14 @@
-{ config, pkgs, lib }:
-
-lib.makeScope pkgs.newScope (self: with self; {
+{ config, pkgs, lib, splicePackages, newScope
+, pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget, pkgsHostHost, pkgsTargetTarget }:
+
+lib.makeScopeWithSplicing splicePackages newScope {
+  selfBuildBuild = pkgsBuildBuild.gnome;
+  selfBuildHost = pkgsBuildHost.gnome;
+  selfBuildTarget = pkgsBuildTarget.gnome;
+  selfHostHost = pkgsHostHost.gnome;
+  selfTargetTarget = pkgsTargetTarget.gnome or {};
+} (self: { }) (spliced0: { })
+(self: let inherit (self) callPackage; in {
   updateScript = callPackage ./update.nix { };
 
   /* Remove packages of packagesToRemove from packages, based on their names
@@ -19,7 +27,7 @@ lib.makeScope pkgs.newScope (self: with self; {
       lib.filter (x: !(builtins.elem (lib.getName x) namesToRemove)) packages;
 
   libsoup = pkgs.libsoup.override { gnomeSupport = true; };
-  libchamplain = pkgs.libchamplain.override { libsoup = libsoup; };
+  libchamplain = pkgs.libchamplain.override { libsoup = self.libsoup; };
 
 # ISO installer
 # installerIso = callPackage ./installer.nix {};