Skip to content

Commit 0600d57

Browse files
committed
update sway to master
1 parent 36f9fde commit 0600d57

1 file changed

Lines changed: 7 additions & 10 deletions

File tree

modules/system/nixpkgs.nix

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -51,27 +51,24 @@
5151
'';
5252
});
5353
wlroots_0_19 = prev.wlroots_0_19.overrideAttrs (old: {
54+
pname = "wlroots";
55+
version = "0.21.0-dev";
5456
src = prev.fetchFromGitLab {
5557
domain = "gitlab.freedesktop.org";
5658
owner = "wlroots";
5759
repo = "wlroots";
58-
rev = "1ce992d7cb5023a7a7c91ed6ce156529e3709657";
59-
hash = "sha256-2iVbJK4i37DIsTCy8cGsjsVoJobJe5kfGa1VCe9bmmQ=";
60+
rev = "e22084f63967aa72cb56873aeb48b01fb8dc2c9b";
61+
hash = "sha256-6eOqeq9yYeY815rad1Pw2XhF1Y/eee9HwWlCNVZpfFo=";
6062
};
63+
mesonFlags = builtins.filter (opt: !prev.lib.hasInfix "xwayland" opt) old.mesonFlags;
6164
});
6265
sway-unwrapped = prev.sway-unwrapped.overrideAttrs (old: {
6366
src = prev.fetchFromGitHub {
6467
owner = "swaywm";
6568
repo = "sway";
66-
rev = "c57daaf0d1640b45579d75ce9775b8c0d03299b7";
67-
hash = "sha256-zP+cgC/sv5hxcH50z5h0nji1YEMEpQfZUR3n3OrN1nY=";
69+
rev = "909a2ddb5fff528e735341529a028d2ef21836db";
70+
hash = "sha256-Qjz4XGiggSj6kg6GXMMPl4JYE8yYy1byvNNBvvXnuZI=";
6871
};
69-
# patches = old.patches ++ [
70-
# (prev.fetchurl {
71-
# url = "https://github.com/swaywm/sway/compare/master..emersion:hdr10.patch";
72-
# hash = "sha256-wekk6bXwiSL0VCgJGEXuiMUGv9MxjG/8JmDfHlMtBMo=";
73-
# })
74-
# ];
7572
});
7673
android-tools = prev.androidenv.androidPkgs.platform-tools.overrideAttrs (oldAttrs: rec {
7774
version = "36.0.0";

0 commit comments

Comments
 (0)