diff options
| author | Sergei Trofimovich <slyich@gmail.com> | 2022-06-04 07:37:00 +0100 |
|---|---|---|
| committer | Sergei Trofimovich <slyich@gmail.com> | 2022-06-04 07:37:00 +0100 |
| commit | 2c90bada3dc7b56f317dc6f5112f7542c98b8beb (patch) | |
| tree | 1cd21bb10afaa9a0afa23534ba84c5fdfeabb6b8 | |
| parent | bd7aa1e1bff5bc8319168849d5a3bdb8c5be8ccd (diff) | |
| download | nixpkgs-2c90bada3dc7b56f317dc6f5112f7542c98b8beb.tar nixpkgs-2c90bada3dc7b56f317dc6f5112f7542c98b8beb.tar.gz nixpkgs-2c90bada3dc7b56f317dc6f5112f7542c98b8beb.tar.bz2 nixpkgs-2c90bada3dc7b56f317dc6f5112f7542c98b8beb.tar.lz nixpkgs-2c90bada3dc7b56f317dc6f5112f7542c98b8beb.tar.xz nixpkgs-2c90bada3dc7b56f317dc6f5112f7542c98b8beb.tar.zst nixpkgs-2c90bada3dc7b56f317dc6f5112f7542c98b8beb.zip | |
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
| -rw-r--r-- | pkgs/applications/audio/mimic/default.nix | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/pkgs/applications/audio/mimic/default.nix b/pkgs/applications/audio/mimic/default.nix index 870584d357e..7e11c0a8d75 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 |