cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

menu-cache: pull patch pending upstream inclusion for -fno-common toolchains

Browse source 
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:
Sergei Trofimovich 2022-05-22 11:09:34 +01:00
parent 3b468e68b7
commit a4850d6ea2
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/development/libraries/menu-cache/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, glib, pkg-config, libfm-extra }:
{ lib, stdenv, fetchurl, fetchpatch, glib, pkg-config, libfm-extra }:
stdenv.mkDerivation rec {
pname = "menu-cache";
@ -9,6 +9,16 @@ stdenv.mkDerivation rec {
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 ];
buildInputs = [ glib libfm-extra ];