lol

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

+11 -1
+11 -1
pkgs/development/libraries/menu-cache/default.nix
··· 1 - { lib, stdenv, fetchurl, glib, pkg-config, libfm-extra }: 1 + { lib, stdenv, fetchurl, fetchpatch, glib, pkg-config, libfm-extra }: 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "menu-cache"; ··· 8 8 url = "mirror://sourceforge/lxde/menu-cache-${version}.tar.xz"; 9 9 sha256 = "1iry4zlpppww8qai2cw4zid4081hh7fz8nzsp5lqyffbkm2yn0pd"; 10 10 }; 11 + 12 + patches = [ 13 + # Pull patch pending upstream inclusion for -fno-common toolchain support: 14 + # https://github.com/lxde/menu-cache/pull/19 15 + (fetchpatch { 16 + name = "fno-common.patch"; 17 + url = "https://github.com/lxde/menu-cache/commit/1ce739649b4d66339a03fc0ec9ee7a2f7c141780.patch"; 18 + sha256 = "08x3h0w2pl8ifj83v9jkf4j3zxcwsyzh251divlhhnwx0rw1pyn7"; 19 + }) 20 + ]; 11 21 12 22 nativeBuildInputs = [ pkg-config ]; 13 23