Skip to content

gnome: switch to makeScopeWithSplicing #154751

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
NickCao wants to merge 1 commit into from
Closed

gnome: switch to makeScopeWithSplicing #154751

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions pkgs/desktops/gnome/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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 {};
Expand Down