Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Describe your PR, what does it fix/add?
The nix overlay defined in
nix/overlays.nixdefines a function calledmkJoinedOverlaysto combine the correct dependencies for hyprland. This function however only combines the result of multiple overlays but does not provide the dependency overlay outputs tocallPackageas an input when defining thehyprlandpackage. This means that the internal dependencywlroots-hyprlandmust be defined on the final nixpkgs fixpoint.To avoid name clashes, I personally shadow my flake input's overlays to provide a cleaner package set when selecting packages (i.e. hide internal dependencies). Because the hyprland overlay depends on the final package set to have a root
wlroots-hyprlandpackage, this prohibits my workflow. This PR fixes that.Is there anything you want to mention? (unchecked code, possible bugs, found problems, breaking compatibility, etc.)
This fix should be fully backwards compatible. I have tested that the overlay output package is a derivation. I have not tested the theoretical possibility of still manually overriding
wlroots-hyprlandusinghyprland.override { ... }. This should however work since the hyprland package is a standardmkDerivationresult.Is it ready for merging, or does it need work?
ready, do I need formatting?