JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vinagre: pull fix pending upstream inclusiong for -fno-common toolchain support

Browse Source 
Without the change build fails on upstream gcc-10 as:

    ld: plugins/vnc/vinagre_vinagre-vinagre-vnc-tab.o:plugins/vnc/vinagre-vnc-connection.h:29:
      multiple definition of `scaling_command_line';
        vinagre/vinagre_vinagre-vinagre-reverse-vnc-listener.o:plugins/vnc/vinagre-vnc-connection.h:29: first defined here
This commit is contained in:
Sergei Trofimovich 2022-06-09 09:33:38 +01:00
parent 05eb6570c0
commit 7593e005e1
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/desktops/gnome/apps/vinagre/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pkg-config, gtk3, gnome, vte, libxml2, gtk-vnc, intltool
{ lib, stdenv, fetchurl, fetchpatch, pkg-config, gtk3, gnome, vte, libxml2, gtk-vnc, intltool
, libsecret, itstool, wrapGAppsHook, librsvg }:
stdenv.mkDerivation rec {
@ -10,6 +10,16 @@ stdenv.mkDerivation rec {
sha256 = "cd1cdbacca25c8d1debf847455155ee798c3e67a20903df8b228d4ece5505e82";
};
patches = [
# Pull fix pending upstream inclusion for -fno-common toolchain support:
# https://gitlab.gnome.org/GNOME/vinagre/-/merge_requests/8
(fetchpatch {
name = "fno-common.patch";
url = "https://gitlab.gnome.org/GNOME/vinagre/-/commit/c51662cf4338516773d64776c3c92796917ff2bd.diff";
sha256 = "0zn8cd93hjdz6rw2d7gfl1ghzkc9h0x40k9l0jx3n5qfwdq4sir8";
})
];
nativeBuildInputs = [ pkg-config intltool itstool wrapGAppsHook ];
buildInputs = [
gtk3 vte libxml2 gtk-vnc libsecret gnome.adwaita-icon-theme librsvg