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

gnome3: use package names for environment.gnome3.excludePackages

This commit is contained in:
Luca Bruno 2014-04-11 00:28:15 +02:00
parent 4c8b9fc957
commit 9d5a06cfe7
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/lists.nix
View File

@ -227,6 +227,4 @@ in rec {
crossLists = f: foldl (fs: args: concatMap (f: map f args) fs) [f]; 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;
} }

12
nixos/modules/services/x11/desktop-managers/gnome3.nix
View File

@ -5,6 +5,16 @@ with pkgs.lib;
let let
cfg = config.services.xserver.desktopManager.gnome3; cfg = config.services.xserver.desktopManager.gnome3;
gnome3 = pkgs.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 { in {
options = { options = {
@ -68,7 +78,7 @@ in {
gnome3.gnome_settings_daemon gnome3.gnome_settings_daemon
gnome3.gnome_shell gnome3.gnome_shell
gnome3.gnome_themes_standard gnome3.gnome_themes_standard
] ++ (lists.difference [ ] ++ (removePackagesByName [
gnome3.baobab gnome3.baobab
gnome3.eog gnome3.eog
gnome3.epiphany gnome3.epiphany