From 2c90bada3dc7b56f317dc6f5112f7542c98b8beb Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 4 Jun 2022 07:37:00 +0100 Subject: [PATCH] mimic: pull upstream fix for -fno-common toolchains Without the change build fails on upstream gcc-10 as: ld: cmu_indic_lang.o:cmu_indic_lang.h:54: multiple definition of `cst_rx_not_indic'; cmu_indic_lang.h:54: first defined here --- pkgs/applications/audio/mimic/default.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/audio/mimic/default.nix b/pkgs/applications/audio/mimic/default.nix index 870584d357eb..7e11c0a8d75f 100644 --- a/pkgs/applications/audio/mimic/default.nix +++ b/pkgs/applications/audio/mimic/default.nix @@ -1,4 +1,5 @@ -{ config, lib, stdenv, autoreconfHook, fetchFromGitHub, pkg-config, makeWrapper +{ config, lib, stdenv, autoreconfHook, fetchFromGitHub, fetchpatch +, pkg-config, makeWrapper , alsa-lib, alsa-plugins, libtool, icu, pcre2 , pulseaudioSupport ? config.pulseaudio or false, libpulseaudio }: @@ -13,6 +14,16 @@ stdenv.mkDerivation rec { sha256 = "1agwgby9ql8r3x5rd1rgx3xp9y4cdg4pi3kqlz3vanv9na8nf3id"; }; + patches = [ + # Pull upstream fix for -fno-common toolchains: + # https://github.com/MycroftAI/mimic1/pull/216 + (fetchpatch { + name = "fno-common"; + url = "https://github.com/MycroftAI/mimic1/commit/77b36eaeb2c38eba571b8db7e9bb0fd507774e6d.patch"; + sha256 = "0n3hqrfpbdp44y0c8bq55ay9m4c96r09k18hjxka4x54j5c7lw1m"; + }) + ]; + nativeBuildInputs = [ autoreconfHook pkg-config