git.iko.soy/typeable/nixpkgs
on master help sign in
sway-beta: Use the upstream patch to fix the build failure
commit12408341763b8f2f0f0a88001d9650313f6371d5 authorMichael Weiss <dev.primeos@gmail.com> dateMon 11 Mar 2019, 18:46 (8 years ago) parent88c3183
1 file changed+8−11
pkgs/applications/window-managers/sway/beta.nix+8−11
pkgs/applications/window-managers/sway/beta.nix+8−11
@@ -19,17 +19,14 @@ stdenv.mkDerivation rec {
1919 sha256 = "09cndc2nl39d3l7g5634xp0pxcz60pvc5277mfw89r22mh0j78rx";
2020 };
2121
22− # TODO: The following patch introduced a compiler warning which leads to a
23− # build failure (we'll revert it for now as this patch is not supposed to
24− # change any functionality):
25− patch-remove-unused-functions = fetchpatch {
26− url = "https://github.com/swaywm/sway/commit/2b70e8518b7327d29eec4f9593e9b8f4238cebfe.patch";
27− sha256 = "1bq1i8dzxwckahzna6s9swvhpj1c1ics14pc1f1jcxwya50lk1rz";
28− };
29−
30− postPatch = ''
31− patch -p1 --reverse < ${patch-remove-unused-functions}
32− '';
22+ patches = [
23+ # Fix for a compiler warning that causes a build failure
24+ # (see https://github.com/swaywm/sway/issues/3862):
25+ (fetchpatch {
26+ url = "https://github.com/swaywm/sway/commit/bcde298a719f60b9913133dbd2a169dedbc8dd7d.patch";
27+ sha256 = "0r583nmqvq43ib93yv6flw8pj833v32lbs0q0xld56s3rnzvvdcp";
28+ })
29+ ];
3330
3431 nativeBuildInputs = [
3532 pkgconfig meson ninja