Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

nixos/display-managers: Add DesktopNames parameter to generated desktop session files #79830

Merged
merged 1 commit into from Feb 12, 2020

Conversation

@ilya-fedin
Copy link
Contributor

@ilya-fedin ilya-fedin commented Feb 11, 2020

Motivation for this change

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

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
@worldofpeace
Copy link
Member

@worldofpeace worldofpeace commented Feb 11, 2020

Actually forgot to request this when I reviewed the PR that added it.

@worldofpeace
Copy link
Member

@worldofpeace worldofpeace commented Feb 11, 2020

@ilya-fedin your commit message don't match the contributing guidelines https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md#submitting-changes.

It should be prefixed with the package name or module path.

nixos/display-managers: ...
@jtojnar
Copy link
Contributor

@jtojnar jtojnar commented Feb 11, 2020

Good catch. We should probably also check whether the downstream session names match the upstream ones.

…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
@ilya-fedin ilya-fedin force-pushed the ilya-fedin:fix-xdg-current-desktop branch from 04266c8 to f7768c9 Feb 12, 2020
@ilya-fedin
Copy link
Contributor Author

@ilya-fedin ilya-fedin commented Feb 12, 2020

@worldofpeace oops, thanks

@worldofpeace worldofpeace changed the title Add DesktopNames parameter to generated desktop session files nixos/display-managers: Add DesktopNames parameter to generated desktop session files Feb 12, 2020
@worldofpeace worldofpeace merged commit 2d31632 into NixOS:master Feb 12, 2020
12 checks passed
12 checks passed
Evaluation Performance Report Evaluator Performance Report
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A darwin-tested
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release-combined.nix -A tested
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
@worldofpeace
Copy link
Member

@worldofpeace worldofpeace commented Feb 12, 2020

@worldofpeace worldofpeace mentioned this pull request Feb 13, 2020
3 of 10 tasks complete
@ilya-fedin
Copy link
Contributor Author

@ilya-fedin ilya-fedin commented Feb 15, 2020

Can you open a backport of this to release-20.03

Okay

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

3 participants
You can’t perform that action at this time.