pyrox.dev
glabels: pull fix pending upstream inclusion for -fno-common toolchain support
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
+11
-1
pkgs/applications/graphics/glabels/default.nix
+11
-1
pkgs/applications/graphics/glabels/default.nix
···
1
-
{ lib, stdenv, fetchurl, barcode, gnome, autoreconfHook
1
+
{ lib, stdenv, fetchurl, fetchpatch, barcode, gnome, autoreconfHook
2
2
, gtk3, gtk-doc, libxml2, librsvg , libtool, libe-book, gsettings-desktop-schemas
3
3
, intltool, itstool, makeWrapper, pkg-config, yelp-tools
4
4
}:
···
11
11
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
12
12
sha256 = "0f2rki8i27pkd9r0gz03cdl1g4vnmvp0j49nhxqn275vi8lmgr0q";
13
13
};
14
+
15
+
patches = [
16
+
# Pull patch pending upstream inclusion for -fno-common toolchain support:
17
+
# https://github.com/jimevins/glabels/pull/76
18
+
(fetchpatch {
19
+
name = "fno-common.patch";
20
+
url = "https://github.com/jimevins/glabels/commit/f64e3f34e3631330fff2fb48ab271ff9c6160229.patch";
21
+
sha256 = "13q6g4bxzvzwjnvzkvijds2b6yvc4xqbdwgqnwmj65ln6ngxz8sa";
22
+
})
23
+
];
14
24
15
25
nativeBuildInputs = [ autoreconfHook pkg-config makeWrapper intltool ];
16
26
buildInputs = [