diff --git a/pkgs/applications/window-managers/sway/beta.nix b/pkgs/applications/window-managers/sway/beta.nix index 83c8e9328ca..35f310f06db 100644 --- a/pkgs/applications/window-managers/sway/beta.nix +++ b/pkgs/applications/window-managers/sway/beta.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ stdenv, fetchFromGitHub, fetchpatch , meson, ninja , pkgconfig, scdoc , wayland, libxkbcommon, pcre, json_c, dbus, libevdev @@ -10,17 +10,25 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "sway"; - version = "1.0-rc5"; + version = "1.0"; src = fetchFromGitHub { owner = "swaywm"; repo = "sway"; rev = version; - sha256 = "1jkacibmxy9rpq5mxnq7bkwcy0c592zk4vf20j5qbbljp9h7c87i"; + sha256 = "09cndc2nl39d3l7g5634xp0pxcz60pvc5277mfw89r22mh0j78rx"; + }; + + # TODO: The following patch introduced a compiler warning which leads to a + # build failure (we'll revert it for now as this patch is not supposed to + # change any functionality): + patch-remove-unused-functions = fetchpatch { + url = "https://github.com/swaywm/sway/commit/2b70e8518b7327d29eec4f9593e9b8f4238cebfe.patch"; + sha256 = "1bq1i8dzxwckahzna6s9swvhpj1c1ics14pc1f1jcxwya50lk1rz"; }; postPatch = '' - sed -iE "s/version: '1.0',/version: '${version}',/" meson.build + patch -p1 --reverse < ${patch-remove-unused-functions} ''; nativeBuildInputs = [