dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

petrifoo: pull patch pending upstream inclusion for -fno-common toolchain support

Browse Source 
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
This commit is contained in:
Sergei Trofimovich 2022-05-28 17:11:53 +01:00
parent 17b62c338f
commit 58631ab7d1
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/applications/audio/petrifoo/default.nix
View File

@ -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