From dc840fc6ab6d7c28496635e37d5bc48f9a1866d9 Mon Sep 17 00:00:00 2001 From: Guanran Wang Date: Tue, 20 Feb 2024 17:33:22 +0800 Subject: [PATCH] overlays: fix sway's patches' filename --- overlays/sway/input-method-popup.nix | 14 ++++++-------- overlays/sway/tray-dbus-menu.nix | 14 ++++++++------ 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/overlays/sway/input-method-popup.nix b/overlays/sway/input-method-popup.nix index c814598..b0799b6 100644 --- a/overlays/sway/input-method-popup.nix +++ b/overlays/sway/input-method-popup.nix @@ -1,12 +1,10 @@ {addPatches, ...}: _final: prev: { sway-unwrapped = addPatches prev.sway-unwrapped [ - # Tray D-Bus Menu - # https://github.com/swaywm/sway/pull/6249 - (prev.runCommand "2f304ef0532a45d00b2ec2c7fc63adef0aec7607.patch" {} '' - cat ${prev.fetchpatch { - url = "https://github.com/swaywm/sway/commit/2f304ef0532a45d00b2ec2c7fc63adef0aec7607.patch"; - hash = "sha256-nd+Z6A7GE5Go7QxXOI+hiLWQiXegsQatcNfxEsXgamI="; - }} | sed "s/int surface_x, surface_y, surface_width, surface_height;/int surface_x, surface_y, surface_width, surface_height = 0;/g" > $out - '') + # text_input: Implement input-method popups + # https://github.com/swaywm/sway/pull/7226 + (prev.fetchpatch { + url = "https://github.com/swaywm/sway/commit/d1c6e44886d1047b3aa6ff6aaac383eadd72f36a.patch"; + hash = "sha256-LsCoK60FKp3d8qopGtrbCFXofxHT+kOv1e1PiLSyvsA="; + }) ]; } diff --git a/overlays/sway/tray-dbus-menu.nix b/overlays/sway/tray-dbus-menu.nix index b0799b6..c814598 100644 --- a/overlays/sway/tray-dbus-menu.nix +++ b/overlays/sway/tray-dbus-menu.nix @@ -1,10 +1,12 @@ {addPatches, ...}: _final: prev: { sway-unwrapped = addPatches prev.sway-unwrapped [ - # text_input: Implement input-method popups - # https://github.com/swaywm/sway/pull/7226 - (prev.fetchpatch { - url = "https://github.com/swaywm/sway/commit/d1c6e44886d1047b3aa6ff6aaac383eadd72f36a.patch"; - hash = "sha256-LsCoK60FKp3d8qopGtrbCFXofxHT+kOv1e1PiLSyvsA="; - }) + # Tray D-Bus Menu + # https://github.com/swaywm/sway/pull/6249 + (prev.runCommand "2f304ef0532a45d00b2ec2c7fc63adef0aec7607.patch" {} '' + cat ${prev.fetchpatch { + url = "https://github.com/swaywm/sway/commit/2f304ef0532a45d00b2ec2c7fc63adef0aec7607.patch"; + hash = "sha256-nd+Z6A7GE5Go7QxXOI+hiLWQiXegsQatcNfxEsXgamI="; + }} | sed "s/int surface_x, surface_y, surface_width, surface_height;/int surface_x, surface_y, surface_width, surface_height = 0;/g" > $out + '') ]; }