Merge pull request #176110 from trofi/fix-fno-common-for-zynaddsubfx-mruby-zest

zynaddsubfx: pull upstream fix for -fno-common (mruby-zest)
2022-06-03 20:42:03 +02:00
parent 3b36dfc0b3 338484a75e
commit 173f77c785
1 changed files with 9 additions and 0 deletions
@@ -1,5 +1,6 @@
 { lib, stdenv
 , fetchFromGitHub
+, fetchpatch
 , bison
 , git
 , python2
@@ -71,6 +72,14 @@ stdenv.mkDerivation rec {
  patches = [
    ./force-gcc-as-linker.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