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

sway: 1.8.1 -> 1.9.0 #287805

Merged
merged 1 commit into from
Feb 29, 2024
Merged

sway: 1.8.1 -> 1.9.0 #287805

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions nixos/modules/programs/wayland/sway.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,10 +119,10 @@ in {
extraPackages = mkOption {
type = with types; listOf package;
default = with pkgs; [
swaylock swayidle foot dmenu
swaylock swayidle foot dmenu wmenu
];
defaultText = literalExpression ''
with pkgs; [ swaylock swayidle foot dmenu ];
with pkgs; [ swaylock swayidle foot dmenu wmenu ];
'';
example = literalExpression ''
with pkgs; [
Expand Down
14 changes: 3 additions & 11 deletions pkgs/by-name/sw/sway-unwrapped/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
, meson, ninja, pkg-config, wayland-scanner, scdoc
, libGL, wayland, libxkbcommon, pcre2, json_c, libevdev
, pango, cairo, libinput, gdk-pixbuf, librsvg
, wlroots_0_16, wayland-protocols, libdrm
, wlroots, wayland-protocols, libdrm
, nixosTests
# Used by the NixOS module:
, isNixOS ? false
Expand All @@ -11,19 +11,16 @@
, trayEnabled ? systemdSupport
}:

let
wlroots = wlroots_0_16;
fpletz marked this conversation as resolved.
Show resolved Hide resolved
in
stdenv.mkDerivation (finalAttrs: {
pname = "sway-unwrapped";
version = "1.8.1";
version = "1.9";

inherit enableXWayland isNixOS systemdSupport trayEnabled;
src = fetchFromGitHub {
owner = "swaywm";
repo = "sway";
rev = finalAttrs.version;
hash = "sha256-WxnT+le9vneQLFPz2KoBduOI+zfZPhn1fKlaqbPL6/g=";
hash = "sha256-/6+iDkQfdLcL/pTJaqNc6QdP4SRVOYLjfOItEu/bZtg=";
};

patches = [
Expand All @@ -34,11 +31,6 @@ stdenv.mkDerivation (finalAttrs: {
inherit swaybg;
})

(fetchpatch {
name = "LIBINPUT_CONFIG_ACCEL_PROFILE_CUSTOM.patch";
url = "https://github.com/swaywm/sway/commit/dee032d0a0ecd958c902b88302dc59703d703c7f.diff";
hash = "sha256-dx+7MpEiAkxTBnJcsT3/1BO8rYRfNLecXmpAvhqGMD0=";
})
] ++ lib.optionals (!finalAttrs.isNixOS) [
# References to /nix/store/... will get GC'ed which causes problems when
# copying the default configuration:
Expand Down
15 changes: 3 additions & 12 deletions pkgs/by-name/sw/swayfx-unwrapped/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
sway-unwrapped,
stdenv,
systemd,
wlroots_0_16,
# Used by the NixOS module:
isNixOS ? false,
enableXWayland ? true,
Expand All @@ -18,6 +19,8 @@
systemdSupport
trayEnabled
;

wlroots = wlroots_0_16;
}).overrideAttrs (oldAttrs: rec {
pname = "swayfx-unwrapped";
version = "0.3.2";
Expand All @@ -29,18 +32,6 @@
sha256 = "sha256-Gwewb0yDVhEBrefSSGDf1hLtpWcntzifPCPJQhqLqI0=";
};

# 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 [ ]);

meta = with lib; {
description = "Sway, but with eye candy!";
homepage = "https://github.com/WillPower3309/swayfx";
Expand Down
4 changes: 4 additions & 0 deletions pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4776,6 +4776,10 @@ with pkgs;

slurp = callPackage ../tools/wayland/slurp { };

sway-unwrapped = callPackage ../by-name/sw/sway-unwrapped/package.nix {
thiagokokada marked this conversation as resolved.
Show resolved Hide resolved
wlroots = wlroots_0_17;
};

swaykbdd = callPackage ../tools/wayland/swaykbdd { };

swayr = callPackage ../tools/wayland/swayr { };
Expand Down
Loading