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

i3blocks: handle multiple XDG_CONFIG_DIRS elements correctly #71339

Merged
merged 1 commit into from
Oct 18, 2019
Merged

i3blocks: handle multiple XDG_CONFIG_DIRS elements correctly #71339

merged 1 commit into from
Oct 18, 2019
+10 −1

Conversation

edef1c
Copy link
Member

@edef1c edef1c commented Oct 18, 2019 •
edited
Loading

Motivation for this change

On NixOS, $XDG_CONFIG_DIRS always has multiple elements.
Without this patch, it'll try to open() a rather nonsensical path full of colons.

Upstream PR: vivien/i3blocks#405

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nix-review --run "nix-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.

Sorry, something went wrong.

@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Oct 18, 2019
worldofpeace
worldofpeace approved these changes Oct 18, 2019
View reviewed changes
Copy link
Contributor

@worldofpeace worldofpeace left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM thanks @edef1c ✨

@edef1c
i3blocks: handle multiple XDG_CONFIG_DIRS elements correctly

Verified

This commit was signed with the committer’s verified signature.
eadwu Edmund Wu
GPG key ID: 76AA3F9F2BD3E3A0
Verified
Learn about vigilant mode
e674377 
On NixOS, $XDG_CONFIG_DIRS always has multiple elements.
Without this patch, it'll try to open() a rather nonsensical
path full of colons.
@worldofpeace
Copy link
Contributor

Thanks, this application matches the freedesktop spec now. I'm certain upstream should accept it, or at least I'd strongly advise they should.

@worldofpeace worldofpeace merged commit 38c0090 into NixOS:master Oct 18, 2019
@edef1c edef1c deleted the i3blocks-xdg branch October 18, 2019 21:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@worldofpeace worldofpeace

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@edef1c @worldofpeace