Build libjack2 for supercollider with same GCC

Also remove trailing whitespace
wip/yesman
Matthias Beyer 8 years ago
parent a2ac3683ce
commit 7f4d52e27e
  1. 14
      pkgs/development/interpreters/supercollider/default.nix
  2. 4
      pkgs/misc/jackaudio/default.nix

@ -3,10 +3,12 @@
, libXt, qt, readline
, useSCEL ? false, emacs
}:
let optional = stdenv.lib.optional; in
stdenv.mkDerivation rec {
let optional = stdenv.lib.optional;
ljack2 = libjack2.override { gcc = gcc; };
in
stdenv.mkDerivation rec {
name = "supercollider-3.6.6";
meta = {
@ -29,12 +31,12 @@ stdenv.mkDerivation rec {
cmakeFlags = ''
-DSC_WII=OFF
-DSC_EL=${if useSCEL then "ON" else "OFF"}
-DSC_EL=${if useSCEL then "ON" else "OFF"}
'';
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [
gcc libjack2 libsndfile fftw curl libXt qt readline ]
buildInputs = [
gcc ljack2 libsndfile fftw curl libXt qt readline ]
++ optional useSCEL emacs;
}

@ -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

Loading…
Cancel
Save