summary refs log tree commit diff
diff options
context:
space:
mode:
authorworldofpeace <worldofpeace@protonmail.ch>2019-12-02 18:05:41 +0000
committerGitHub <noreply@github.com>2019-12-02 18:05:41 +0000
commit5350db96e2991ac3aa9dc3c0db1521f546e53223 (patch)
tree2574ceb69378f974cb2f904cfa9f97e91edc82ff
parenta402fa81b1e48e587a20e4dc9d7c95a287912e5d (diff)
parent91296169197b12e268fabd89bf966dfeabe67719 (diff)
downloadnixpkgs-5350db96e2991ac3aa9dc3c0db1521f546e53223.tar
nixpkgs-5350db96e2991ac3aa9dc3c0db1521f546e53223.tar.gz
nixpkgs-5350db96e2991ac3aa9dc3c0db1521f546e53223.tar.bz2
nixpkgs-5350db96e2991ac3aa9dc3c0db1521f546e53223.tar.lz
nixpkgs-5350db96e2991ac3aa9dc3c0db1521f546e53223.tar.xz
nixpkgs-5350db96e2991ac3aa9dc3c0db1521f546e53223.tar.zst
nixpkgs-5350db96e2991ac3aa9dc3c0db1521f546e53223.zip
Merge pull request #74838 from jtojnar/pantheon-debug
nixos/pantheon fix GNOME_SESSION_DEBUG conflict
-rw-r--r--nixos/modules/services/x11/desktop-managers/pantheon.nix2
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 80dab135ee2..25ef1cbfc67 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";