zynaddsubfx: pull upstream fix for -fno-common (mruby-zest)
Without the change internal dependency mruby-zest fails to build on -fno-common toolchain as: ld: libmruby.a(nvg_context.o):mruby-nanovg/src/nvg_context.c:217: multiple definition of `mrb_nvg_context_type'; libmruby.a(gem.o):mruby-widget-lib/src/gem.c:293: first defined here
This commit is contained in:
parent
c5516d1d00
commit
338484a75e
|
@ -1,5 +1,6 @@
|
||||||
{ lib, stdenv
|
{ lib, stdenv
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
|
, fetchpatch
|
||||||
, bison
|
, bison
|
||||||
, git
|
, git
|
||||||
, python2
|
, python2
|
||||||
|
@ -71,6 +72,14 @@ stdenv.mkDerivation rec {
|
||||||
patches = [
|
patches = [
|
||||||
./force-gcc-as-linker.patch
|
./force-gcc-as-linker.patch
|
||||||
./system-libuv.patch
|
./system-libuv.patch
|
||||||
|
|
||||||
|
# Pull upstream fix for -fno-common toolchains:
|
||||||
|
# https://github.com/mruby-zest/mruby-zest-build/issues/25
|
||||||
|
(fetchpatch {
|
||||||
|
name = "fno-common.patch";
|
||||||
|
url = "https://github.com/mruby-zest/mruby-zest-build/commit/4eb88250f22ee684acac95d4d1f114df504e37a7.patch";
|
||||||
|
sha256 = "0wg7qy1vg0mzcxagf35bv35dlr0q17pxjicigpf86yqppvgrzrsb";
|
||||||
|
})
|
||||||
];
|
];
|
||||||
|
|
||||||
# Add missing dependencies of deps/mruby-dir-glob/mrbgem.rake
|
# Add missing dependencies of deps/mruby-dir-glob/mrbgem.rake
|
||||||
|
|
Loading…
Reference in a new issue