diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2019-01-17 16:05:14 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-01-17 16:05:14 +0100 |
commit | 23c1a234dc9b09a03bdcc8be763e65b473553753 (patch) | |
tree | 440ec81216a4f1f5233a9912ccb10042ac85ebcf /nixos/modules | |
parent | 6bd544d00d36bfd54a2d79af70dcade4a39956b3 (diff) | |
parent | bedc81fcb6b67b4a280d03c95f7c5af248aa670c (diff) | |
download | nixlib-23c1a234dc9b09a03bdcc8be763e65b473553753.tar nixlib-23c1a234dc9b09a03bdcc8be763e65b473553753.tar.gz nixlib-23c1a234dc9b09a03bdcc8be763e65b473553753.tar.bz2 nixlib-23c1a234dc9b09a03bdcc8be763e65b473553753.tar.lz nixlib-23c1a234dc9b09a03bdcc8be763e65b473553753.tar.xz nixlib-23c1a234dc9b09a03bdcc8be763e65b473553753.tar.zst nixlib-23c1a234dc9b09a03bdcc8be763e65b473553753.zip |
Merge pull request #54124 from jtojnar/remove-packages-by-name
nixos/desktops: deduplicate removePackagesByName
Diffstat (limited to 'nixos/modules')
-rw-r--r-- | nixos/modules/services/x11/desktop-managers/gnome3.nix | 10 | ||||
-rw-r--r-- | nixos/modules/services/x11/desktop-managers/lxqt.nix | 11 | ||||
-rw-r--r-- | nixos/modules/services/x11/desktop-managers/mate.nix | 10 |
3 files changed, 3 insertions, 28 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index 1f005b2cf044..dfff6c720d79 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -5,14 +5,6 @@ with lib; let cfg = config.services.xserver.desktopManager.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; - in - filter (x: !(builtins.elem (pkgName x) ysNames)) xs; - # Prioritize nautilus by default when opening directories mimeAppsList = pkgs.writeTextFile { name = "gnome-mimeapps"; @@ -167,7 +159,7 @@ in { "${pkgs.gnome3.glib-networking.out}/lib/gio/modules" "${pkgs.gnome3.gvfs}/lib/gio/modules" ]; environment.systemPackages = pkgs.gnome3.corePackages ++ cfg.sessionPath - ++ (removePackagesByName pkgs.gnome3.optionalPackages config.environment.gnome3.excludePackages) ++ [ + ++ (pkgs.gnome3.removePackagesByName pkgs.gnome3.optionalPackages config.environment.gnome3.excludePackages) ++ [ pkgs.xdg-user-dirs # Update user dirs as described in http://freedesktop.org/wiki/Software/xdg-user-dirs/ ]; diff --git a/nixos/modules/services/x11/desktop-managers/lxqt.nix b/nixos/modules/services/x11/desktop-managers/lxqt.nix index 896f70c86ebb..686bbd0dcf98 100644 --- a/nixos/modules/services/x11/desktop-managers/lxqt.nix +++ b/nixos/modules/services/x11/desktop-managers/lxqt.nix @@ -3,15 +3,6 @@ with lib; let - - # 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; - in - filter (x: !(builtins.elem (pkgName x) ysNames)) xs; - xcfg = config.services.xserver; cfg = xcfg.desktopManager.lxqt; @@ -60,7 +51,7 @@ in environment.systemPackages = pkgs.lxqt.preRequisitePackages ++ pkgs.lxqt.corePackages ++ - (removePackagesByName + (pkgs.gnome3.removePackagesByName pkgs.lxqt.optionalPackages config.environment.lxqt.excludePackages); diff --git a/nixos/modules/services/x11/desktop-managers/mate.nix b/nixos/modules/services/x11/desktop-managers/mate.nix index db83aaf3c19f..4d2fafd14961 100644 --- a/nixos/modules/services/x11/desktop-managers/mate.nix +++ b/nixos/modules/services/x11/desktop-managers/mate.nix @@ -4,14 +4,6 @@ with lib; let - # 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; - in - filter (x: !(builtins.elem (pkgName x) ysNames)) xs; - addToXDGDirs = p: '' if [ -d "${p}/share/gsettings-schemas/${p.name}" ]; then export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${p}/share/gsettings-schemas/${p.name} @@ -96,7 +88,7 @@ in environment.systemPackages = pkgs.mate.basePackages ++ - (removePackagesByName + (pkgs.gnome3.removePackagesByName pkgs.mate.extraPackages config.environment.mate.excludePackages); |