Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 6948bfce69d0
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f43895474f37
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Feb 15, 2020

  1. nixos/display-managers: Add DesktopNames parameter to generated deskt…

    …op session files
    
    Some display managers (e.g. SDDM) set the XDG_CURRENT_DESKTOP variable accroding to this parameter.
    If this variable is not defined, there will be some problems (e.g. MATE doesn't have icons on the desktop).
    
    Fixes #71427
    
    (cherry picked from commit f7768c9)
    ilya-fedin committed Feb 15, 2020
    Copy the full SHA
    75f90af View commit details
  2. Merge pull request #80200 from ilya-fedin/backport-fix-xdg-current-de…

    …sktop
    
    Backport DesktopNames parameter to 20.03
    worldofpeace authored Feb 15, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    f438954 View commit details
Showing with 1 addition and 0 deletions.
  1. +1 −0 nixos/modules/services/x11/display-managers/default.nix
1 change: 1 addition & 0 deletions nixos/modules/services/x11/display-managers/default.nix
Original file line number Diff line number Diff line change
@@ -427,6 +427,7 @@ in
TryExec=${script}
Exec=${script}
Name=${sessionName}
DesktopNames=${sessionName}
'';
} // {
providedSessions = [ sessionName ];