mate: use newScope

This commit is contained in:
romildo 2017-08-31 13:25:16 -03:00
parent a9f66285b7
commit 8f8d308fe1
2 changed files with 58 additions and 55 deletions

View file

@ -1,57 +1,62 @@
{ callPackage, pkgs }:
{ pkgs, newScope }:
rec {
let
callPackage = newScope self;
atril = callPackage ./atril { };
caja = callPackage ./caja { };
caja-extensions = callPackage ./caja-extensions { };
cajaWithExtensions = callPackage ./caja/cajaWithExtensions.nix {
extensions = [ caja-extensions ];
};
engrampa = callPackage ./engrampa { };
eom = callPackage ./eom { };
libmatekbd = callPackage ./libmatekbd { };
libmatemixer = callPackage ./libmatemixer { };
libmateweather = callPackage ./libmateweather { };
marco = callPackage ./marco { };
mate-common = callPackage ./mate-common { };
mate-control-center = callPackage ./mate-control-center { };
mate-desktop = callPackage ./mate-desktop { };
mate-icon-theme = callPackage ./mate-icon-theme { };
mate-icon-theme-faenza = callPackage ./mate-icon-theme-faenza { };
mate-menus = callPackage ./mate-menus { };
mate-panel = callPackage ./mate-panel { };
mate-session-manager = callPackage ./mate-session-manager { };
mate-settings-daemon = callPackage ./mate-settings-daemon { };
mate-terminal = callPackage ./mate-terminal { };
mate-themes = callPackage ./mate-themes { };
pluma = callPackage ./pluma { };
self = rec {
basePackages = [
caja
libmatekbd
libmatemixer
libmateweather
marco
mate-common
mate-control-center
mate-desktop
mate-icon-theme
mate-menus
mate-panel
mate-session-manager
mate-settings-daemon
mate-themes
];
atril = callPackage ./atril { };
caja = callPackage ./caja { };
caja-extensions = callPackage ./caja-extensions { };
cajaWithExtensions = callPackage ./caja/cajaWithExtensions.nix {
extensions = [ caja-extensions ];
};
engrampa = callPackage ./engrampa { };
eom = callPackage ./eom { };
libmatekbd = callPackage ./libmatekbd { };
libmatemixer = callPackage ./libmatemixer { };
libmateweather = callPackage ./libmateweather { };
marco = callPackage ./marco { };
mate-common = callPackage ./mate-common { };
mate-control-center = callPackage ./mate-control-center { };
mate-desktop = callPackage ./mate-desktop { };
mate-icon-theme = callPackage ./mate-icon-theme { };
mate-icon-theme-faenza = callPackage ./mate-icon-theme-faenza { };
mate-menus = callPackage ./mate-menus { };
mate-panel = callPackage ./mate-panel { };
mate-session-manager = callPackage ./mate-session-manager { };
mate-settings-daemon = callPackage ./mate-settings-daemon { };
mate-terminal = callPackage ./mate-terminal { };
mate-themes = callPackage ./mate-themes { };
pluma = callPackage ./pluma { };
extraPackages = [
atril
cajaWithExtensions
engrampa
eom
mate-icon-theme-faenza
mate-terminal
pluma
];
basePackages = [
caja
libmatekbd
libmatemixer
libmateweather
marco
mate-common
mate-control-center
mate-desktop
mate-icon-theme
mate-menus
mate-panel
mate-session-manager
mate-settings-daemon
mate-themes
];
extraPackages = [
atril
cajaWithExtensions
engrampa
eom
mate-icon-theme-faenza
mate-terminal
pluma
];
}
};
in self

View file

@ -17821,9 +17821,7 @@ with pkgs;
inherit (lib) makeScope;
});
mate = recurseIntoAttrs (callPackage ../desktops/mate {
callPackage = newScope pkgs.mate;
});
mate = recurseIntoAttrs (callPackage ../desktops/mate { });
maxx = callPackage ../desktops/maxx { };