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

Swayfx #2

Merged
merged 2 commits into from
Feb 29, 2024
Merged

Swayfx #2

merged 2 commits into from
Feb 29, 2024

Conversation

eclairevoyant
Copy link

Fixes swayfx breakages when bumping sway version

Copy link
Owner

@raboof raboof left a comment

Choose a reason for hiding this comment

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

I'm OK to merge this, but perhaps we should use wlroots instead of wlroots_0_17 in sway-unwrapped then...

@@ -18,6 +19,8 @@
systemdSupport
trayEnabled
;

wlroots_0_17 = wlroots_0_16;
Copy link
Owner

Choose a reason for hiding this comment

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

😢 maybe we should make it wlroots there after all then

Copy link
Author

@eclairevoyant eclairevoyant Feb 26, 2024

Choose a reason for hiding this comment

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

Is there a guideline that prefers that? I don't see anything in contributing.md or pkgs/readme.md on that.

And to me, it's further obscuring the dependencies...

Copy link
Owner

Choose a reason for hiding this comment

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

Neither is great, but passing wlroots_0_16 for wlroots_0_17 seems rather confusing to me...

Copy link

@thiagokokada thiagokokada Feb 28, 2024

Choose a reason for hiding this comment

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

I think this ends up being the limitation of the current pkgs/by-name approach.

But really, I think we should just decouple swayfx from sway derivation instead. Copy-and-paste sometimes is better than having coupling between packages, and the fact that any change in sway can break swayfx is a strong argument to not having those 2 derivations share code.

Comment on lines -32 to -42
# This patch was backported into SwayFX
# remove when next release is rebased on Sway 1.9
patches =
let
removePatches = [
"LIBINPUT_CONFIG_ACCEL_PROFILE_CUSTOM.patch"
];
in
builtins.filter
(patch: !builtins.elem (patch.name or null) removePatches)
(oldAttrs.patches or [ ]);
Copy link

@thiagokokada thiagokokada Feb 28, 2024

Choose a reason for hiding this comment

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

I think this is another good example on why trying to reuse code sometimes ends up unnecessary complicating things.

I am in favor of just making those 2 derivations completely independent. WDYT @raboof @eclairevoyant ?

Copy link
Owner

Choose a reason for hiding this comment

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

It's a balance between avoiding duplication and being autonomous.

For my own Sway fork, Volare, the build 'itself' is independent (https://codeberg.org/raboof/volare/src/branch/main/flake.nix#L10) but I do re-use the sway module (https://codeberg.org/raboof/volare#when-using-flakes-for-your-nixos-configuration).

Choose a reason for hiding this comment

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

I think this approach is just causing an additional maintenance burden. Decoupling would solve all problems and avoid new ones in the future.

Also, if I remember correctly overriding packages causes a few strange issues, for example the update scripts don't work as it should (they try to update the original package instead the overriden one).

Copy link
Author

@eclairevoyant eclairevoyant Feb 29, 2024

Choose a reason for hiding this comment

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

Also, if I remember correctly overriding packages causes a few strange issues, for example the update scripts don't work as it should

I would call this a bug in the update script. But yes, let's eventually decouple these. They are fundamentally just different codebases, have different release schedules, etc. and have diverged substantially by now.

@raboof raboof merged this pull request into raboof:sway-update-to-1.9 Feb 29, 2024
5 checks passed
@eclairevoyant eclairevoyant deleted the swayfx branch February 29, 2024 11:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants