diff options
| author | Sergei Trofimovich <slyich@gmail.com> | 2022-06-02 23:39:34 +0100 |
|---|---|---|
| committer | Sergei Trofimovich <slyich@gmail.com> | 2022-06-02 23:39:34 +0100 |
| commit | e25aad2049f74e83fbd0aca975b60163065979c2 (patch) | |
| tree | 99872509fd758113ba40afad83047a39c6634380 | |
| parent | 4c704d3306ffa945bd40c7765e29dfb9c75f34df (diff) | |
| download | nixpkgs-e25aad2049f74e83fbd0aca975b60163065979c2.tar nixpkgs-e25aad2049f74e83fbd0aca975b60163065979c2.tar.gz nixpkgs-e25aad2049f74e83fbd0aca975b60163065979c2.tar.bz2 nixpkgs-e25aad2049f74e83fbd0aca975b60163065979c2.tar.lz nixpkgs-e25aad2049f74e83fbd0aca975b60163065979c2.tar.xz nixpkgs-e25aad2049f74e83fbd0aca975b60163065979c2.tar.zst nixpkgs-e25aad2049f74e83fbd0aca975b60163065979c2.zip | |
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.
| -rw-r--r-- | pkgs/tools/networking/uget/default.nix | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/pkgs/tools/networking/uget/default.nix b/pkgs/tools/networking/uget/default.nix index 2bece5e30dd..5f255ecb80f 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 |