diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-07-30 15:03:10 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-07-30 15:03:10 -0700 |
| commit | 7ebe164ae027972cf2a7c05fa9021fb489d063cb (patch) | |
| tree | 60b3e3ce7a01a6bbd608d3afdf05461fbadaa029 /pkgs/development/interpreters | |
| parent | 428f9ad382d2f0911ff3c70e55f427d305002b3e (diff) | |
| parent | 942e74bec8ba8d3de286f16a68dd73f22b78ce00 (diff) | |
| download | nixlib-7ebe164ae027972cf2a7c05fa9021fb489d063cb.tar nixlib-7ebe164ae027972cf2a7c05fa9021fb489d063cb.tar.gz nixlib-7ebe164ae027972cf2a7c05fa9021fb489d063cb.tar.bz2 nixlib-7ebe164ae027972cf2a7c05fa9021fb489d063cb.tar.lz nixlib-7ebe164ae027972cf2a7c05fa9021fb489d063cb.tar.xz nixlib-7ebe164ae027972cf2a7c05fa9021fb489d063cb.tar.zst nixlib-7ebe164ae027972cf2a7c05fa9021fb489d063cb.zip | |
Merge branch 'master.upstream' into staging.upstream
Diffstat (limited to 'pkgs/development/interpreters')
| -rw-r--r-- | pkgs/development/interpreters/supercollider/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix index a20d5b1dfd12..f44347c61b74 100644 --- 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; } |