BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

glabels: pull fix pending upstream inclusion for -fno-common toolchain support

Browse source 
Without the change builds fails on upstream gcc-10 as:

    ld: label.o:src/template-history.h:31: multiple definition of `gl_template_history'; glabels-batch.o:src/template-history.h:31: first defined here
    ld: label-text.o:src/font-history.h:31: multiple definition of `gl_font_history'; glabels-batch.o:src/font-history.h:31: first defined here
    ld: font-history.o:src/font-history.h:31: multiple definition of `gl_font_history'; glabels-batch.o:src/font-history.h:31: first defined here
    ld: template-history.o:src/template-history.h:31: multiple definition of `gl_template_history'; glabels-batch.o:src/template-history.h:31: first defined here
This commit is contained in:
Sergei Trofimovich 2022-05-21 10:38:52 +01:00
parent 25e4e7af03
commit 4fc2a31536
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/applications/graphics/glabels/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, barcode, gnome, autoreconfHook
{ lib, stdenv, fetchurl, fetchpatch, barcode, gnome, autoreconfHook
, gtk3, gtk-doc, libxml2, librsvg , libtool, libe-book, gsettings-desktop-schemas
, intltool, itstool, makeWrapper, pkg-config, yelp-tools
}:
@ -12,6 +12,16 @@ stdenv.mkDerivation rec {
sha256 = "0f2rki8i27pkd9r0gz03cdl1g4vnmvp0j49nhxqn275vi8lmgr0q";
};
patches = [
# Pull patch pending upstream inclusion for -fno-common toolchain support:
# https://github.com/jimevins/glabels/pull/76
(fetchpatch {
name = "fno-common.patch";
url = "https://github.com/jimevins/glabels/commit/f64e3f34e3631330fff2fb48ab271ff9c6160229.patch";
sha256 = "13q6g4bxzvzwjnvzkvijds2b6yvc4xqbdwgqnwmj65ln6ngxz8sa";
})
];
nativeBuildInputs = [ autoreconfHook pkg-config makeWrapper intltool ];
buildInputs = [
barcode gtk3 gtk-doc yelp-tools