Skip to content

Commit

Permalink
Enable workspaces patch only for Weston 12.0
Browse files Browse the repository at this point in the history
Conditionally enable workspaces patch only for Weston 12.0, since it
does not apply properly on 13.0. NixOS 24.05 will change to 13.0.

Signed-off-by: Mika Tammi <[email protected]>
  • Loading branch information
Mika Tammi authored and brianmcgillion committed Dec 8, 2023
1 parent 9a793b4 commit 57ed5ba
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions overlays/custom-packages/weston/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#
# This overlay customizes weston - see comments for details
#
(_final: prev: {
(final: prev: {
weston =
# First, weston package is overridden
(
Expand All @@ -19,8 +19,10 @@
)
# and then this overridden package's attributes are overridden
.overrideAttrs (
_prevAttrs: {
patches = [./weston-backport-workspaces.patch];
}
_prevAttrs:
# TODO: Add patch for 13.0 which is coming in NixOS 24.05
final.lib.optionalAttrs ((final.lib.versions.majorMinor prev.weston.version) == "12.0") {
patches = [./weston-backport-workspaces.patch];
}
);
})

0 comments on commit 57ed5ba

Please sign in to comment.