diff options
author | Luca Bruno <lucabru@src.gnome.org> | 2014-04-11 00:28:15 +0200 |
---|---|---|
committer | Luca Bruno <lucabru@src.gnome.org> | 2014-04-14 09:58:03 +0200 |
commit | 9d5a06cfe7160db895962815fb60d989e3705d4b (patch) | |
tree | 0fc4b53d2262b5bc4b3df2aaac61eaf4c451bbf8 | |
parent | 4c8b9fc957e4dcd15cd0e6ff7d55937f367c4a37 (diff) | |
download | nixlib-9d5a06cfe7160db895962815fb60d989e3705d4b.tar nixlib-9d5a06cfe7160db895962815fb60d989e3705d4b.tar.gz nixlib-9d5a06cfe7160db895962815fb60d989e3705d4b.tar.bz2 nixlib-9d5a06cfe7160db895962815fb60d989e3705d4b.tar.lz nixlib-9d5a06cfe7160db895962815fb60d989e3705d4b.tar.xz nixlib-9d5a06cfe7160db895962815fb60d989e3705d4b.tar.zst nixlib-9d5a06cfe7160db895962815fb60d989e3705d4b.zip |
gnome3: use package names for environment.gnome3.excludePackages
-rw-r--r-- | lib/lists.nix | 2 | ||||
-rw-r--r-- | nixos/modules/services/x11/desktop-managers/gnome3.nix | 12 |
2 files changed, 11 insertions, 3 deletions
diff --git a/lib/lists.nix b/lib/lists.nix index 6c7773304def..4b5f04a67585 100644 --- a/lib/lists.nix +++ b/lib/lists.nix @@ -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; } diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index be41d917792a..60a74d6c7fe9 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -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 |