From 64e8b14527c789cf6607767d645dbf420293a5b9 Mon Sep 17 00:00:00 2001 From: Guanran Wang Date: Sat, 22 Feb 2025 01:56:17 +0800 Subject: [PATCH] sway-unwrapped: 1.10 -> 1.10.1 (#377055) --- pkgs/by-name/sw/sway-unwrapped/package.nix | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/pkgs/by-name/sw/sway-unwrapped/package.nix b/pkgs/by-name/sw/sway-unwrapped/package.nix index 482d8b8fb550..733385c0a63a 100644 --- a/pkgs/by-name/sw/sway-unwrapped/package.nix +++ b/pkgs/by-name/sw/sway-unwrapped/package.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, replaceVars, swaybg +{ lib, stdenv, fetchFromGitHub, replaceVars, swaybg , meson, ninja, pkg-config, wayland-scanner, scdoc , libGL, wayland, libxkbcommon, pcre2, json_c, libevdev , pango, cairo, libinput, gdk-pixbuf, librsvg @@ -13,14 +13,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "sway-unwrapped"; - version = "1.10"; + version = "1.10.1"; inherit enableXWayland isNixOS systemdSupport trayEnabled; src = fetchFromGitHub { owner = "swaywm"; repo = "sway"; rev = finalAttrs.version; - hash = "sha256-PzeU/niUdqI6sf2TCG19G2vNgAZJE5JCyoTwtO9uFTk="; + hash = "sha256-uBtQk8uhW/i8lSbv6zwsRyiiImFBw1YCQHVWQ8jot5w="; }; patches = [ @@ -29,19 +29,6 @@ stdenv.mkDerivation (finalAttrs: { (replaceVars ./fix-paths.patch { inherit swaybg; }) - - # libinput-1.27 support: - # https://github.com/swaywm/sway/pull/8470 - (fetchpatch { - name = "libinput-1.27-p1.patch"; - url = "https://github.com/swaywm/sway/commit/bbadf9b8b10d171a6d5196da7716ea50ee7a6062.patch"; - hash = "sha256-lA+oL1vqGQOm7K+AthzHYBzmOALrDgxzX/5Dx7naq84="; - }) - (fetchpatch { - name = "libinput-1.27-p2.patch"; - url = "https://github.com/swaywm/sway/commit/e2409aa49611bee1e1b99033461bfab0a7550c48.patch"; - hash = "sha256-l598qfq+rpKy3/0arQruwd+BsELx85XDjwIDkb/o6og="; - }) ] ++ lib.optionals (!finalAttrs.isNixOS) [ # References to /nix/store/... will get GC'ed which causes problems when # copying the default configuration: