colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mate: use newScope

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

109
pkgs/desktops/mate/default.nix
View File

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

4
pkgs/top-level/all-packages.nix
View File

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