diff options
| author | Luca Bruno <lethalman88@gmail.com> | 2015-07-30 13:09:58 +0200 |
|---|---|---|
| committer | Luca Bruno <lethalman88@gmail.com> | 2015-07-30 13:09:58 +0200 |
| commit | 863d426a3b8a4a56e34af3f687d18f42dad2ac44 (patch) | |
| tree | 3ef8f91da6803c6279fb638167234f7bc5ec22a2 /pkgs | |
| parent | 8dbc328ad66089d51736ad55aeb3edb4377fa948 (diff) | |
| download | nixlib-863d426a3b8a4a56e34af3f687d18f42dad2ac44.tar nixlib-863d426a3b8a4a56e34af3f687d18f42dad2ac44.tar.gz nixlib-863d426a3b8a4a56e34af3f687d18f42dad2ac44.tar.bz2 nixlib-863d426a3b8a4a56e34af3f687d18f42dad2ac44.tar.lz nixlib-863d426a3b8a4a56e34af3f687d18f42dad2ac44.tar.xz nixlib-863d426a3b8a4a56e34af3f687d18f42dad2ac44.tar.zst nixlib-863d426a3b8a4a56e34af3f687d18f42dad2ac44.zip | |
supercollider: build with gcc48 (ZHF)
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/interpreters/supercollider/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
2 files changed, 3 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; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 02c37c059d3e..46eacf48a1fc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5150,6 +5150,7 @@ let spidermonkey_24 = callPackage ../development/interpreters/spidermonkey/24.2.nix { }; supercollider = callPackage ../development/interpreters/supercollider { + gcc = gcc48; # doesn't build with gcc49 qt = qt4; fftw = fftwSinglePrec; }; |