From 58631ab7d1b0f0bc89783f184e76a5887a97a73c Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 28 May 2022 17:11:53 +0100 Subject: [PATCH] petrifoo: pull patch pending upstream inclusion for -fno-common toolchain support Without the change build fails on upstream gcc-10 as: ld: CMakeFiles/petri-foo.dir/voicetab.c.o:(.bss+0x0): multiple definition of `recent_manager'; CMakeFiles/petri-foo.dir/audio-settings.c.o:(.bss+0x0): first defined here --- pkgs/applications/audio/petrifoo/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/audio/petrifoo/default.nix b/pkgs/applications/audio/petrifoo/default.nix index f76720aff907..10362e04d550 100644 --- a/pkgs/applications/audio/petrifoo/default.nix +++ b/pkgs/applications/audio/petrifoo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, alsa-lib, cmake, gtk2, libjack2, libgnomecanvas +{ lib, stdenv, fetchurl, fetchpatch, alsa-lib, cmake, gtk2, libjack2, libgnomecanvas , libpthreadstubs, libsamplerate, libsndfile, libtool, libxml2 , pkg-config, openssl }: @@ -11,6 +11,16 @@ stdenv.mkDerivation rec { sha256 = "0b25iicgn8c42487fdw32ycfrll1pm2zjgy5djvgw6mfcaa4gizh"; }; + patches = [ + # Pull patch pending upstream inclusion for -fno-common toollchain support: + # https://github.com/petri-foo/Petri-Foo/pull/43 + (fetchpatch { + name = "fno-common.patch"; + url = "https://github.com/petri-foo/Petri-Foo/commit/6a3256c9b619b1fed18ad15063f110e8d91aa6fe.patch"; + sha256 = "05yc4g22iwnd054jmvihrl461yr0cxnghslfrbhan6bac6fcvlal"; + }) + ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ alsa-lib gtk2 libjack2 libgnomecanvas libpthreadstubs