diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2019-12-02 17:23:02 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-12-02 17:25:24 +0100 |
| commit | 91296169197b12e268fabd89bf966dfeabe67719 (patch) | |
| tree | 6eca33916e2dc2f973ac3f160465e81c1efd7280 /nixos | |
| parent | f97746ba2726128dcf40134837ffd13b4042e95d (diff) | |
| download | nixlib-91296169197b12e268fabd89bf966dfeabe67719.tar nixlib-91296169197b12e268fabd89bf966dfeabe67719.tar.gz nixlib-91296169197b12e268fabd89bf966dfeabe67719.tar.bz2 nixlib-91296169197b12e268fabd89bf966dfeabe67719.tar.lz nixlib-91296169197b12e268fabd89bf966dfeabe67719.tar.xz nixlib-91296169197b12e268fabd89bf966dfeabe67719.tar.zst nixlib-91296169197b12e268fabd89bf966dfeabe67719.zip | |
nixos/pantheon fix GNOME_SESSION_DEBUG conflict
When session debugging was enabled in GNOME but not in Pantheon
{
services.xserver = {
desktopManager.pantheon = {
enable = true;
};
desktopManager.gnome3 = {
enable = true;
debug = true;
};
};
}
it caused a conflict:
error: The option `environment.sessionVariables.GNOME_SESSION_DEBUG' has conflicting definitions, in `<nixpkgs/nixos/modules/services/x11/desktop-managers/pantheon.nix>' and `<nixpkgs/nixos/modules/services/x11/desktop-managers/gnome3.nix>'.
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/x11/desktop-managers/pantheon.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix index 80dab135ee26..25ef1cbfc67e 100644 --- a/nixos/modules/services/x11/desktop-managers/pantheon.nix +++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix @@ -159,7 +159,7 @@ in # Override GSettings schemas environment.sessionVariables.NIX_GSETTINGS_OVERRIDES_DIR = "${nixos-gsettings-desktop-schemas}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas"; - environment.sessionVariables.GNOME_SESSION_DEBUG = optionalString cfg.debug "1"; + environment.sessionVariables.GNOME_SESSION_DEBUG = mkIf cfg.debug "1"; # Settings from elementary-default-settings environment.sessionVariables.GTK_CSD = "1"; |