Unverified Commit a5041403 authored by Thomas Tuegel's avatar Thomas Tuegel Committed by GitHub
Browse files

Merge pull request #173972 from trofi/fix-fno-common-for-menu-cache

menu-cache: pull patch pending upstream inclusion for -fno-common too…
parents 3d1917bd a4850d6e
Loading
Loading
Loading
Loading
+11 −1
Original line number Diff line number Diff line
{ 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 ];