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.

Sign up for GitHub

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

Jump to bottom

nixos/x11: Respect XCOMPOSECACHE/XDG_DATA_HOME if set in xsession-wrapper #95019

Merged
merged 3 commits into from Feb 28, 2021
Merged

nixos/x11: Respect XCOMPOSECACHE/XDG_DATA_HOME if set in xsession-wrapper #95019

merged 3 commits into from Feb 28, 2021

Conversation

SFrijters
Copy link
Member

Motivation for this change

This is a revival of #42677 of which the fork of nixpkgs has been removed.

The first commit is to allow user settings in ~/.xsession to actually affect the process.

Compared to the old PR I have applied one fix #42677 (comment) , removed the intermediate variable xdg_data_home, and unset compose_cache after use.

I am not sure if this would adversely affect anything, but in principle the behaviour doesn't change if the variables are not set.

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.

@SFrijters SFrijters mentioned this pull request Aug 13, 2020
Closed
@SFrijters
Copy link
Member Author

Not sure who can give a (final) opinion on this, so I added some of the recent contributors to this file as potential reviewers.

@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-ready-for-review/3032/305

@SFrijters SFrijters force-pushed the xsession-env-vars branch 2 times, most recently from 3fac5f7 to 8a288d3 Compare October 1, 2020 11:15
@SFrijters
Copy link
Member Author

@adisbladis As someone who recently committed to this file as well: do you have an opinion on this PR?

@solson
Copy link
Member

solson commented Oct 12, 2020

LGTM, I'd love to see this get merged. I've been trying to make my ~ more XDG Base Directory compliant.

@SFrijters
Copy link
Member Author

Rebased to fix merge conflicts.

@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-ready-for-review/3032/410

@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-in-distress/3604/41

@SFrijters
Copy link
Member Author

As a single data point: I've been using this as a module override in my config since I started working on the PR and it Works For Me.

@AndersonTorres AndersonTorres merged commit e753d4c into NixOS:master Feb 28, 2021
@SFrijters SFrijters deleted the xsession-env-vars branch February 28, 2021 18:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@AndersonTorres AndersonTorres AndersonTorres approved these changes

@hmenke hmenke hmenke approved these changes

@worldofpeace worldofpeace Awaiting requested review from worldofpeace

@adisbladis adisbladis Awaiting requested review from adisbladis

@jtojnar jtojnar Awaiting requested review from jtojnar

Assignees
No one assigned
Labels
6.topic: nixos 8.has: module (update) 10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@SFrijters @nixos-discourse @solson @hmenke @AndersonTorres