Merge branch 'master.upstream' into staging.upstream

2015-07-30 15:03:10 -07:00
parent 428f9ad382 942e74bec8
commit 7ebe164ae0
62 changed files with 762 additions and 623 deletions
--- a/pkgs/development/interpreters/supercollider/default.nix
+++ b/pkgs/development/interpreters/supercollider/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, cmake, pkgconfig
-, libjack2, libsndfile, fftw, curl
+, libjack2, libsndfile, fftw, curl, gcc
 , libXt, qt, readline
 , useSCEL ? false, emacs
 }:
@@ -35,6 +35,6 @@ stdenv.mkDerivation rec {
  nativeBuildInputs = [ cmake pkgconfig ];

  buildInputs = [ 
-    libjack2 libsndfile fftw curl libXt qt readline ]
+    gcc libjack2 libsndfile fftw curl libXt qt readline ]
    ++ optional useSCEL emacs;
 }