diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2018-07-06 09:45:40 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2018-07-06 18:20:06 +0200 |
| commit | 188e487dd150c5f730f1d257d3cf1196be837858 (patch) | |
| tree | 16d4e0ebfd169ddcf875eb67b4c6737cadf2e258 /pkgs/desktops | |
| parent | 8f5b0686ee8fa6d7ffeb93bd8d2f3bf316a95ece (diff) | |
| download | nixlib-188e487dd150c5f730f1d257d3cf1196be837858.tar nixlib-188e487dd150c5f730f1d257d3cf1196be837858.tar.gz nixlib-188e487dd150c5f730f1d257d3cf1196be837858.tar.bz2 nixlib-188e487dd150c5f730f1d257d3cf1196be837858.tar.lz nixlib-188e487dd150c5f730f1d257d3cf1196be837858.tar.xz nixlib-188e487dd150c5f730f1d257d3cf1196be837858.tar.zst nixlib-188e487dd150c5f730f1d257d3cf1196be837858.zip | |
gnome3: simplify package set using makeScope
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/gnome-3/default.nix | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index c035dc408dc0..6605d15a697e 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -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)); @@ -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 {} +}) |