diff options
| author | Tor Hedin Brønner <torhedinbronner@gmail.com> | 2018-08-05 16:49:00 +0200 |
|---|---|---|
| committer | Tor Hedin Brønner <torhedinbronner@gmail.com> | 2018-12-10 10:36:25 +0100 |
| commit | cdd266c73bee26b6cd7e092da9a4cc0f34237434 (patch) | |
| tree | bfa46c51147d57194306a7a05f3feea3ba6122b9 /nixos | |
| parent | 48a9a24910669f07ca158789fcf92ccf13a97db6 (diff) | |
| download | nixlib-cdd266c73bee26b6cd7e092da9a4cc0f34237434.tar nixlib-cdd266c73bee26b6cd7e092da9a4cc0f34237434.tar.gz nixlib-cdd266c73bee26b6cd7e092da9a4cc0f34237434.tar.bz2 nixlib-cdd266c73bee26b6cd7e092da9a4cc0f34237434.tar.lz nixlib-cdd266c73bee26b6cd7e092da9a4cc0f34237434.tar.xz nixlib-cdd266c73bee26b6cd7e092da9a4cc0f34237434.tar.zst nixlib-cdd266c73bee26b6cd7e092da9a4cc0f34237434.zip | |
nixos/gnome3: Implement `sessionPath` through `environment.extraInit`
This will simply make the `sessionPath` more likely to work.
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/x11/desktop-managers/gnome3.nix | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index 72109cf31af3..ba6d333b534e 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -136,19 +136,17 @@ in { services.xserver.displayManager.extraSessionFilePackages = [ pkgs.gnome3.gnome-session ]; - services.xserver.displayManager.sessionCommands = '' - if test "$XDG_CURRENT_DESKTOP" = "GNOME"; then - ${concatMapStrings (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} - fi - - if [ -d "${p}/lib/girepository-1.0" ]; then - export GI_TYPELIB_PATH=$GI_TYPELIB_PATH''${GI_TYPELIB_PATH:+:}${p}/lib/girepository-1.0 - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}${p}/lib - fi - '') cfg.sessionPath} - fi + environment.extraInit = '' + ${concatMapStrings (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} + fi + + if [ -d "${p}/lib/girepository-1.0" ]; then + export GI_TYPELIB_PATH=$GI_TYPELIB_PATH''${GI_TYPELIB_PATH:+:}${p}/lib/girepository-1.0 + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}${p}/lib + fi + '') cfg.sessionPath} ''; environment.variables.GNOME_SESSION_DEBUG = optionalString cfg.debug "1"; |