Build libjack2 for supercollider with same GCC

Also remove trailing whitespace
This commit is contained in:
Matthias Beyer
2016-07-07 16:07:47 +02:00
parent a2ac3683ce
commit 7f4d52e27e
2 changed files with 10 additions and 8 deletions
@@ -4,7 +4,9 @@
, useSCEL ? false, emacs
}:
let optional = stdenv.lib.optional; in
let optional = stdenv.lib.optional;
ljack2 = libjack2.override { gcc = gcc; };
in
stdenv.mkDerivation rec {
name = "supercollider-3.6.6";
@@ -35,6 +37,6 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [
gcc libjack2 libsndfile fftw curl libXt qt readline ]
gcc ljack2 libsndfile fftw curl libXt qt readline ]
++ optional useSCEL emacs;
}
+2 -2
View File
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, pkgconfig, python, makeWrapper
, bash, libsamplerate, libsndfile, readline
, bash, libsamplerate, libsndfile, readline, gcc
# Optional Dependencies
, dbus ? null, pythonDBus ? null, libffado ? null, alsaLib ? null
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig python makeWrapper ];
buildInputs = [
buildInputs = [ gcc
python
libsamplerate libsndfile readline