Merge pull request #176197 from trofi/fix-fno-common-for-mimic
mimic: pull upstream fix for -fno-common toolchains
This commit is contained in:
commit
f3efa1d285
1 changed files with 12 additions and 1 deletions
|
@ -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
|
, alsa-lib, alsa-plugins, libtool, icu, pcre2
|
||||||
, pulseaudioSupport ? config.pulseaudio or false, libpulseaudio }:
|
, pulseaudioSupport ? config.pulseaudio or false, libpulseaudio }:
|
||||||
|
|
||||||
|
@ -13,6 +14,16 @@ stdenv.mkDerivation rec {
|
||||||
sha256 = "1agwgby9ql8r3x5rd1rgx3xp9y4cdg4pi3kqlz3vanv9na8nf3id";
|
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 = [
|
nativeBuildInputs = [
|
||||||
autoreconfHook
|
autoreconfHook
|
||||||
pkg-config
|
pkg-config
|
||||||
|
|
Loading…
Reference in a new issue