Merge pull request #177005 from trofi/fix-fno-common-for-vinagre
vinagre: pull fix pending upstream inclusiong for -fno-common toolcha…
This commit is contained in:
commit
167e455d1f
|
@ -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 }:
|
, libsecret, itstool, wrapGAppsHook, librsvg }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
|
@ -10,6 +10,16 @@ stdenv.mkDerivation rec {
|
||||||
sha256 = "cd1cdbacca25c8d1debf847455155ee798c3e67a20903df8b228d4ece5505e82";
|
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 ];
|
nativeBuildInputs = [ pkg-config intltool itstool wrapGAppsHook ];
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
gtk3 vte libxml2 gtk-vnc libsecret gnome.adwaita-icon-theme librsvg
|
gtk3 vte libxml2 gtk-vnc libsecret gnome.adwaita-icon-theme librsvg
|
||||||
|
|
Loading…
Reference in a new issue