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

sway: remove swaybg from path #109647

Merged
merged 1 commit into from Jan 19, 2021
Merged

sway: remove swaybg from path #109647

merged 1 commit into from Jan 19, 2021

Conversation

deviant
Copy link
Member

@deviant deviant commented Jan 17, 2021

Avoids polluting the environment for sway's children.

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.

@deviant deviant mentioned this pull request Jan 17, 2021
Closed
@ofborg ofborg bot requested review from Ma27, Synthetica9 and primeos January 17, 2021 17:16
primeos
primeos approved these changes Jan 18, 2021
View reviewed changes
Copy link
Member

@primeos primeos left a comment

Choose a reason for hiding this comment

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

LGTM, I don't see any real reason not to merge this. This is a breaking change but I assume that calling swaybg directly is very uncommon and resulting errors should be both easy to notice and resolve. Not sure why we didn't discuss patching Sway in #60434 though.

pkgs/applications/window-managers/sway/default.nix Outdated Show resolved Hide resolved
@deviant
sway: remove swaybg from path
29b14df 
Avoids polluting the environment for sway's children.
@deviant
Copy link
Member Author

deviant commented Jan 18, 2021

@primeos How's this look?

@ofborg ofborg bot requested review from primeos and Ma27 January 18, 2021 17:06
@primeos
Copy link
Member

primeos commented Jan 19, 2021

@deviant looks good, thanks!

@primeos primeos merged commit fdc1e37 into NixOS:master Jan 19, 2021
@deviant deviant deleted the remove-swaybg-from-path branch January 19, 2021 11:02
@alexarice
Copy link
Contributor

My sway can't find swaybg anymore, and I expect its from this change. Any ideas why this could be happening?

@deviant
Copy link
Member Author

deviant commented Jan 22, 2021

@alexarice Are you using any overlays?

@alexarice
Copy link
Contributor

I'm using the nixpkgs-wayland overlay

@alexarice
Copy link
Contributor

ah, this will be missing the patch right?

@deviant
Copy link
Member Author

deviant commented Jan 22, 2021

Yeah. What's happening is it overrides the sway-unwrapped attribute here, but doesn't override the wrapper. Since the wrapper no longer puts swaybg in its $PATH, the nixpkgs-wayland version cannot find it.

@alexarice
Copy link
Contributor

Will make an issue there, thanks for the help

@alexarice alexarice mentioned this pull request Jan 22, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Synthetica9 Synthetica9 Awaiting requested review from Synthetica9

@primeos primeos Awaiting requested review from primeos

@Ma27 Ma27 Awaiting requested review from Ma27

Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@deviant @primeos @alexarice @Ma27 @Synthetica9