summary refs log tree commit diff
diff options
context:
space:
mode:
authorSergei Trofimovich <slyich@gmail.com>2022-05-28 17:11:53 +0100
committerSergei Trofimovich <slyich@gmail.com>2022-05-28 17:11:53 +0100
commit58631ab7d1b0f0bc89783f184e76a5887a97a73c (patch)
tree34113ebece55704599669b99afe2b211b11ab9cb
parent17b62c338f2a0862a58bb6951556beecd98ccda9 (diff)
downloadnixpkgs-58631ab7d1b0f0bc89783f184e76a5887a97a73c.tar
nixpkgs-58631ab7d1b0f0bc89783f184e76a5887a97a73c.tar.gz
nixpkgs-58631ab7d1b0f0bc89783f184e76a5887a97a73c.tar.bz2
nixpkgs-58631ab7d1b0f0bc89783f184e76a5887a97a73c.tar.lz
nixpkgs-58631ab7d1b0f0bc89783f184e76a5887a97a73c.tar.xz
nixpkgs-58631ab7d1b0f0bc89783f184e76a5887a97a73c.tar.zst
nixpkgs-58631ab7d1b0f0bc89783f184e76a5887a97a73c.zip
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
-rw-r--r--pkgs/applications/audio/petrifoo/default.nix12
1 files changed, 11 insertions, 1 deletions
diff --git a/pkgs/applications/audio/petrifoo/default.nix b/pkgs/applications/audio/petrifoo/default.nix
index f76720aff90..10362e04d55 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