JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
menu-cache: pull patch pending upstream inclusion for -fno-common too…
This commit is contained in:
Thomas Tuegel 2022-05-22 06:40:45 -05:00 committed by GitHub
commit a504140341
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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 { 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 ];