diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2022-06-03 20:40:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-03 20:40:49 +0200 |
| commit | 1b443926ad2fdc6d630c83a6fa0b0f8bd67880ea (patch) | |
| tree | 23f5adddfae35a744e7ff45976696a2a7e3432e8 /pkgs/applications/audio | |
| parent | 4ee7fb914828d1a7245d76c101978f7ce4c516cb (diff) | |
| parent | 58631ab7d1b0f0bc89783f184e76a5887a97a73c (diff) | |
Merge pull request #175157 from trofi/fix-fno-common-for-petrifoo
petrifoo: pull patch pending upstream inclusion for -fno-common toolc…
Diffstat (limited to 'pkgs/applications/audio')
| -rw-r--r-- | pkgs/applications/audio/petrifoo/default.nix | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/pkgs/applications/audio/petrifoo/default.nix b/pkgs/applications/audio/petrifoo/default.nix index f76720aff9074..10362e04d5506 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 |