From e25aad2049f74e83fbd0aca975b60163065979c2 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 2 Jun 2022 23:39:34 +0100 Subject: [PATCH] uget: pull upstream fix for -fno-common toolchains Without the change build fails on upstream gcc-10 as: ld: uget_gtk-UgtkApp-main.o:/build/uget-2.2.3/ui-gtk/UgtkBanner.h:67: multiple definition of `banner'; uget_gtk-UgtkTraveler.o:/build/uget-2.2.3/ui-gtk/UgtkBanner.h:67: first defined here As sourceforge does now allow easy way of extracting patches I inlined the change as a string replacement. --- pkgs/tools/networking/uget/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/tools/networking/uget/default.nix b/pkgs/tools/networking/uget/default.nix index 2bece5e30dd7..5f255ecb80f8 100644 --- a/pkgs/tools/networking/uget/default.nix +++ b/pkgs/tools/networking/uget/default.nix @@ -11,6 +11,13 @@ stdenv.mkDerivation rec { sha256 = "0jchvgkkphhwp2z7vd4axxr9ns8b6vqc22b2z8a906qm8916wd8i"; }; + # Apply upstream fix for -fno-common toolchains. + postPatch = '' + # TODO: remove the replace once upstream fix is released: + # https://sourceforge.net/p/urlget/uget2/ci/14890943c52e0a5cd2a87d8a1c51cbffebee7cf9/ + substituteInPlace ui-gtk/UgtkBanner.h --replace "} banner;" "};" + ''; + nativeBuildInputs = [ pkg-config intltool