diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2016-07-09 13:11:02 +0200 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2016-07-09 13:21:28 +0200 |
| commit | 26dd9acba574fe02db95767f5c995fca8dc90658 (patch) | |
| tree | a80b081f9fd777c9205ab9548ded09448885f5b4 /pkgs/development/interpreters/supercollider | |
| parent | 07615735077db344539eb9131823600593f0eddf (diff) | |
| parent | b571a1a3732027983c4e00ea1dc5736f3ad9680c (diff) | |
Merge remote-tracking branch 'origin/master' into hardened-stdenv
Diffstat (limited to 'pkgs/development/interpreters/supercollider')
| -rw-r--r-- | pkgs/development/interpreters/supercollider/default.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix index c1a4c17707c8..a83b04fec704 100644 --- a/pkgs/development/interpreters/supercollider/default.nix +++ b/pkgs/development/interpreters/supercollider/default.nix @@ -4,7 +4,9 @@ , useSCEL ? false, emacs }: -let optional = stdenv.lib.optional; in +let optional = stdenv.lib.optional; +ljack2 = libjack2.override { gcc = gcc; }; +in stdenv.mkDerivation rec { name = "supercollider-3.6.6"; @@ -37,6 +39,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ - gcc libjack2 libsndfile fftw curl libXt qt readline ] - ++ optional useSCEL emacs; + gcc ljack2 libsndfile fftw curl libXt qt readline ] + ++ optional useSCEL emacs; } |