forked from mirrors/nixpkgs
gnome3: use package names for environment.gnome3.excludePackages
This commit is contained in:
parent
4c8b9fc957
commit
9d5a06cfe7
|
@ -227,6 +227,4 @@ in rec {
|
|||
|
||||
crossLists = f: foldl (fs: args: concatMap (f: map f args) fs) [f];
|
||||
|
||||
# List difference, xs - ys. Removes elements of ys from xs.
|
||||
difference = xs: ys: filter (y: !(builtins.elem y ys)) xs;
|
||||
}
|
||||
|
|
|
@ -5,6 +5,16 @@ with pkgs.lib;
|
|||
let
|
||||
cfg = config.services.xserver.desktopManager.gnome3;
|
||||
gnome3 = pkgs.gnome3;
|
||||
|
||||
# Remove packages of ys from xs, based on their names
|
||||
removePackagesByName = xs: ys:
|
||||
let
|
||||
pkgName = drv: (builtins.parseDrvName drv.name).name;
|
||||
ysNames = map pkgName ys;
|
||||
res = (filter (x: !(builtins.elem (pkgName x) ysNames)) xs);
|
||||
in
|
||||
filter (x: !(builtins.elem (pkgName x) ysNames)) xs;
|
||||
|
||||
in {
|
||||
|
||||
options = {
|
||||
|
@ -68,7 +78,7 @@ in {
|
|||
gnome3.gnome_settings_daemon
|
||||
gnome3.gnome_shell
|
||||
gnome3.gnome_themes_standard
|
||||
] ++ (lists.difference [
|
||||
] ++ (removePackagesByName [
|
||||
gnome3.baobab
|
||||
gnome3.eog
|
||||
gnome3.epiphany
|
||||
|
|
Loading…
Reference in a new issue