public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libjack2: add patch to fix build with gcc6

Browse Source
This commit is contained in:
Robin Gloster 2017-01-21 14:43:45 +01:00
parent d31b3a9e6d
commit 246765f33d
No known key found for this signature in database
GPG Key ID: 5E4C836C632C2882
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/misc/jackaudio/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, pkgconfig, python2Packages, makeWrapper { stdenv, fetchFromGitHub, fetchpatch, pkgconfig, python2Packages, makeWrapper
, bash, libsamplerate, libsndfile, readline, gcc , bash, libsamplerate, libsndfile, readline
# Optional Dependencies # Optional Dependencies
, dbus ? null, libffado ? null, alsaLib ? null , dbus ? null, libffado ? null, alsaLib ? null
@ -34,11 +34,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ pkgconfig python makeWrapper ]; nativeBuildInputs = [ pkgconfig python makeWrapper ];
buildInputs = [ gcc buildInputs = [ python libsamplerate libsndfile readline
python
libsamplerate libsndfile readline
optDbus optPythonDBus optLibffado optAlsaLib optLibopus optDbus optPythonDBus optLibffado optAlsaLib optLibopus
]; ];
@ -46,7 +42,13 @@ stdenv.mkDerivation rec {
substituteInPlace svnversion_regenerate.sh --replace /bin/bash ${bash}/bin/bash substituteInPlace svnversion_regenerate.sh --replace /bin/bash ${bash}/bin/bash
''; '';
patches = [ ./jack-gcc5.patch ]; patches = [
./jack-gcc5.patch
(fetchpatch {
url = "https://github.com/jackaudio/jack2/commit/ff1ed2c4524095055140370c1008a2d9cccc5645.patch";
sha256 = "0vywakbmlskvs9ginij9ilk39wjyzg7w6cf1qxp11hb0hj69fir5";
})
];
configurePhase = '' configurePhase = ''
python waf configure --prefix=$out \ python waf configure --prefix=$out \