From d16032e7548102c3d4e5b86e62c259a2681417d7 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Fri, 3 Jun 2022 07:27:09 +0100 Subject: [PATCH] wayv: pull patch pending upstream inclusion for -fno-common toolchain support Without the change build fails on upstream gcc-10 as: ld: process.o:(.bss+0x0): multiple definition of `child'; backend.o:(.bss+0x0): first defined here --- pkgs/tools/X11/wayv/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/X11/wayv/default.nix b/pkgs/tools/X11/wayv/default.nix index e489ad0237b..2bdeff6a579 100644 --- a/pkgs/tools/X11/wayv/default.nix +++ b/pkgs/tools/X11/wayv/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchFromGitHub, libX11}: +{lib, stdenv, fetchFromGitHub, fetchpatch, libX11}: stdenv.mkDerivation rec { pname = "wayv"; version = "0.3"; @@ -10,6 +10,16 @@ stdenv.mkDerivation rec { sha256 = "046dvaq6na1fyxz5nrjg13aaz6ific9wbygck0dknqqfmmjrsv3b"; }; + patches = [ + # Pull patch pending upstream inclusion for -fno-common toolchain support: + # https://github.com/mikemb/wayV/pull/1 + (fetchpatch { + name = "fno-common.patch"; + url = "https://github.com/mikemb/wayV/commit/b927793e2a2c92ff1f97b9df9e58c26e73e72012.patch"; + sha256 = "19i10966b0n710dic64p5ajsllkjnz16bp0crxfy9vv08hj1xygi"; + }) + ]; + buildInputs = [ libX11 ]; postInstall = ''