diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2022-06-03 20:42:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-03 20:42:03 +0200 |
| commit | 173f77c785bdf2e2be8e389eb64671c5f33cbec8 (patch) | |
| tree | f9d51821378324d6a2974f082249f5341fca8e67 /pkgs/applications/audio | |
| parent | 3b36dfc0b3e9bb76edaf5cceba2f7317aeb9b2a2 (diff) | |
| parent | 338484a75e756e7430d3edec20dcf8c3fff13992 (diff) | |
Merge pull request #176110 from trofi/fix-fno-common-for-zynaddsubfx-mruby-zest
zynaddsubfx: pull upstream fix for -fno-common (mruby-zest)
Diffstat (limited to 'pkgs/applications/audio')
| -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 9dd5b583817d4..1c9cb0a463dc8 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 |