menu-cache: pull patch pending upstream inclusion for -fno-common toolchains
Without the change build fails on upstream gcc-10 as: ld: menu-compose.o:/build/menu-cache-1.1.0/menu-cache-gen/menu-tags.h:25: multiple definition of `menuTag_Menu'; main.o:/build/menu-cache-1.1.0/menu-cache-gen/menu-tags.h:25: first defined here
This commit is contained in:
parent
3b468e68b7
commit
a4850d6ea2
|
@ -1,4 +1,4 @@
|
||||||
{ lib, stdenv, fetchurl, glib, pkg-config, libfm-extra }:
|
{ lib, stdenv, fetchurl, fetchpatch, glib, pkg-config, libfm-extra }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "menu-cache";
|
pname = "menu-cache";
|
||||||
|
@ -9,6 +9,16 @@ stdenv.mkDerivation rec {
|
||||||
sha256 = "1iry4zlpppww8qai2cw4zid4081hh7fz8nzsp5lqyffbkm2yn0pd";
|
sha256 = "1iry4zlpppww8qai2cw4zid4081hh7fz8nzsp5lqyffbkm2yn0pd";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
# Pull patch pending upstream inclusion for -fno-common toolchain support:
|
||||||
|
# https://github.com/lxde/menu-cache/pull/19
|
||||||
|
(fetchpatch {
|
||||||
|
name = "fno-common.patch";
|
||||||
|
url = "https://github.com/lxde/menu-cache/commit/1ce739649b4d66339a03fc0ec9ee7a2f7c141780.patch";
|
||||||
|
sha256 = "08x3h0w2pl8ifj83v9jkf4j3zxcwsyzh251divlhhnwx0rw1pyn7";
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config ];
|
nativeBuildInputs = [ pkg-config ];
|
||||||
|
|
||||||
buildInputs = [ glib libfm-extra ];
|
buildInputs = [ glib libfm-extra ];
|
||||||
|
|
Loading…
Reference in a new issue