nixos/desktop-managers: Fix eval
nixos/lib/utils.nix is actually passed as `utils` argument to modules so https://github.com/NixOS/nixpkgs/pull/168194 broke the eval. Fixes: https://github.com/NixOS/nixpkgs/issues/168569
This commit is contained in:
parent
056b2b3beb
commit
5db9253633
@ -1,4 +1,4 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
{ config, lib, pkgs, utils, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
@ -196,7 +196,7 @@ in
|
||||
programs.evince.enable = mkDefault true;
|
||||
programs.file-roller.enable = mkDefault true;
|
||||
|
||||
environment.systemPackages = with pkgs // pkgs.gnome // pkgs.cinnamon; lib.utils.removePackagesByName [
|
||||
environment.systemPackages = with pkgs // pkgs.gnome // pkgs.cinnamon; utils.removePackagesByName [
|
||||
# cinnamon team apps
|
||||
bulky
|
||||
blueberry
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
{ config, lib, pkgs, utils, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
@ -456,7 +456,7 @@ in
|
||||
(mkIf serviceCfg.core-utilities.enable {
|
||||
environment.systemPackages =
|
||||
with pkgs.gnome;
|
||||
lib.utils.removePackagesByName
|
||||
utils.removePackagesByName
|
||||
([
|
||||
baobab
|
||||
cheese
|
||||
@ -516,7 +516,7 @@ in
|
||||
})
|
||||
|
||||
(mkIf serviceCfg.games.enable {
|
||||
environment.systemPackages = with pkgs.gnome; lib.utils.removePackagesByName [
|
||||
environment.systemPackages = with pkgs.gnome; utils.removePackagesByName [
|
||||
aisleriot
|
||||
atomix
|
||||
five-or-more
|
||||
@ -542,7 +542,7 @@ in
|
||||
|
||||
# Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/-/blob/3.38.0/elements/core/meta-gnome-core-developer-tools.bst
|
||||
(mkIf serviceCfg.core-developer-tools.enable {
|
||||
environment.systemPackages = with pkgs.gnome; lib.utils.removePackagesByName [
|
||||
environment.systemPackages = with pkgs.gnome; utils.removePackagesByName [
|
||||
dconf-editor
|
||||
devhelp
|
||||
pkgs.gnome-builder
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
{ config, lib, pkgs, utils, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
@ -51,7 +51,7 @@ in
|
||||
environment.systemPackages =
|
||||
pkgs.lxqt.preRequisitePackages ++
|
||||
pkgs.lxqt.corePackages ++
|
||||
(lib.utils.removePackagesByName
|
||||
(utils.removePackagesByName
|
||||
pkgs.lxqt.optionalPackages
|
||||
config.environment.lxqt.excludePackages);
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
{ config, lib, pkgs, utils, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
@ -47,7 +47,7 @@ in
|
||||
# Debugging
|
||||
environment.sessionVariables.MATE_SESSION_DEBUG = mkIf cfg.debug "1";
|
||||
|
||||
environment.systemPackages = lib.utils.removePackagesByName
|
||||
environment.systemPackages = utils.removePackagesByName
|
||||
(pkgs.mate.basePackages ++
|
||||
pkgs.mate.extraPackages ++
|
||||
[
|
||||
|
Loading…
Reference in New Issue
Block a user