about summary refs log tree commit diff
path: root/nixpkgs/pkgs/development/libraries/menu-cache
diff options
context:
space:
mode:
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/menu-cache')
-rw-r--r--nixpkgs/pkgs/development/libraries/menu-cache/default.nix12
1 files changed, 11 insertions, 1 deletions
diff --git a/nixpkgs/pkgs/development/libraries/menu-cache/default.nix b/nixpkgs/pkgs/development/libraries/menu-cache/default.nix
index 66fadee0b31f..e05d387846a6 100644
--- a/nixpkgs/pkgs/development/libraries/menu-cache/default.nix
+++ b/nixpkgs/pkgs/development/libraries/menu-cache/default.nix
@@ -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 ];