supercollider: build with gcc48 (ZHF)

This commit is contained in:
Luca Bruno 2015-07-30 13:09:58 +02:00
parent 8dbc328ad6
commit 863d426a3b
2 changed files with 3 additions and 2 deletions

View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, cmake, pkgconfig { stdenv, fetchurl, cmake, pkgconfig
, libjack2, libsndfile, fftw, curl , libjack2, libsndfile, fftw, curl, gcc
, libXt, qt, readline , libXt, qt, readline
, useSCEL ? false, emacs , useSCEL ? false, emacs
}: }:
@ -35,6 +35,6 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkgconfig ]; nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ buildInputs = [
libjack2 libsndfile fftw curl libXt qt readline ] gcc libjack2 libsndfile fftw curl libXt qt readline ]
++ optional useSCEL emacs; ++ optional useSCEL emacs;
} }

View File

@ -5150,6 +5150,7 @@ let
spidermonkey_24 = callPackage ../development/interpreters/spidermonkey/24.2.nix { }; spidermonkey_24 = callPackage ../development/interpreters/spidermonkey/24.2.nix { };
supercollider = callPackage ../development/interpreters/supercollider { supercollider = callPackage ../development/interpreters/supercollider {
gcc = gcc48; # doesn't build with gcc49
qt = qt4; qt = qt4;
fftw = fftwSinglePrec; fftw = fftwSinglePrec;
}; };