diff options
| author | Sergei Trofimovich <slyich@gmail.com> | 2022-06-03 14:44:10 +0100 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2022-08-17 15:47:06 +0000 |
| commit | a10998848d4de77090a56230e60e952f947fb8af (patch) | |
| tree | 0b1fec951a0e9a1a234f5a6dd0e33698c9532f81 | |
| parent | Merge pull request #187129 from NixOS/backport-174377-to-release-22.05 (diff) | |
| download | nixpkgs-a10998848d4de77090a56230e60e952f947fb8af.tar.gz | |
zynaddsubfx: pull upstream fix for -fno-common (mruby-zest)origin/backport-176110-to-release-22.05
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
(cherry picked from commit 338484a75e756e7430d3edec20dcf8c3fff13992)
| -rw-r--r-- | pkgs/applications/audio/zynaddsubfx/mruby-zest/default.nix | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/pkgs/applications/audio/zynaddsubfx/mruby-zest/default.nix b/pkgs/applications/audio/zynaddsubfx/mruby-zest/default.nix index 9dd5b583817d..1c9cb0a463dc 100644 --- a/pkgs/applications/audio/zynaddsubfx/mruby-zest/default.nix +++ b/pkgs/applications/audio/zynaddsubfx/mruby-zest/default.nix @@ -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 |