Skip to content
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

Jump to bottom

gnome3: simplify package set using makeScope #43104

Merged
merged 1 commit into from
Jul 6, 2018
Merged

gnome3: simplify package set using makeScope #43104

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
19 changes: 2 additions & 17 deletions pkgs/desktops/gnome-3/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,6 @@
{ pkgs, lib }:

let

pkgsFun = overrides:
let
self = self_ // overrides;
self_ = with self; {

overridePackages = f:
let newself = pkgsFun (f newself self);
in newself;

callPackage = pkgs.newScope self;

lib.makeScope pkgs.newScope (self: with self; {
# Convert a version to branch (3.26.18 → 3.26)
# Used for finding packages on GNOME mirrors
versionBranch = version: builtins.concatStringsSep "." (lib.take 2 (lib.splitString "." version));
Expand Down Expand Up @@ -431,7 +419,4 @@ let
yelp_xsl = yelp-xsl; # added 2018-02-25
yelp_tools = yelp-tools; # added 2018-02-25

};
in self; # pkgsFun

in pkgsFun {}
})