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

nixos/pantheon fix GNOME_SESSION_DEBUG conflict

Browse Source 
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>'.
This commit is contained in:
Jan Tojnar 2019-12-02 17:23:02 +01:00
parent f97746ba27
commit 9129616919
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/services/x11/desktop-managers/pantheon.nix
View File

@ -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";