From 16ac3420ffdd707b96f39cdf14aebaf1ca81a137 Mon Sep 17 00:00:00 2001 From: sefidel Date: Sun, 4 Aug 2024 21:48:23 +0900 Subject: fix(nixos/haruka): fix sway mesa version mismatch * pin sway version instead of pulling from nixpkgs2311 --- home/default.nix | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/home/default.nix b/home/default.nix index 0d414f3..02571bb 100644 --- a/home/default.nix +++ b/home/default.nix @@ -48,8 +48,26 @@ (final: prev: let nixpkgs2311 = import nixpkgs-2311 { system = "x86_64-linux"; }; - in { - sway-unwrapped = nixpkgs2311.pkgs.sway-unwrapped; + in rec { + sway-unwrapped = (prev.sway-unwrapped.override({ wlroots = prev.wlroots_0_16; })) + .overrideAttrs(rec { + version = "1.8.1"; + + src = prev.fetchFromGitHub { + owner = "swaywm"; + repo = "sway"; + rev = version; + hash = "sha256-WxnT+le9vneQLFPz2KoBduOI+zfZPhn1fKlaqbPL6/g="; + }; + + patches = [ + (prev.fetchpatch { + name = "Fix-libinput-switch-case.patch"; + url = "https://github.com/swaywm/sway/commit/dee032d0a0ecd958c902b88302dc59703d703c7f.patch"; + sha256 = "sha256-dx+7MpEiAkxTBnJcsT3/1BO8rYRfNLecXmpAvhqGMD0="; + }) + ]; + }); }) ]; }; -- cgit 1.4.1