diff options
| author | Robin Gloster <mail@glob.in> | 2017-01-21 14:43:45 +0100 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2017-01-25 20:12:40 +0100 |
| commit | 246765f33db59d7d0244b8c415a76f64f4082538 (patch) | |
| tree | 173b0851063452a4380e3c533380ba45533ffe9b /pkgs/misc/jackaudio | |
| parent | d31b3a9e6dad213fe60b0fe1ede1ca4b87e055f5 (diff) | |
libjack2: add patch to fix build with gcc6
Diffstat (limited to 'pkgs/misc/jackaudio')
| -rw-r--r-- | pkgs/misc/jackaudio/default.nix | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix index a4e4e408fec5..a38c9b764100 100644 --- a/pkgs/misc/jackaudio/default.nix +++ b/pkgs/misc/jackaudio/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, pkgconfig, python2Packages, makeWrapper -, bash, libsamplerate, libsndfile, readline, gcc +{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, python2Packages, makeWrapper +, bash, libsamplerate, libsndfile, readline # Optional Dependencies , dbus ? null, libffado ? null, alsaLib ? null @@ -34,11 +34,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig python makeWrapper ]; - buildInputs = [ gcc - python - - libsamplerate libsndfile readline - + buildInputs = [ python libsamplerate libsndfile readline optDbus optPythonDBus optLibffado optAlsaLib optLibopus ]; @@ -46,7 +42,13 @@ stdenv.mkDerivation rec { 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 = '' python waf configure --prefix=$out \ |