diff options
-rw-r--r-- | pkgs/development/interpreters/supercollider/default.nix | 22 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 14 insertions, 10 deletions
diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix index 77a9392ba8bb..97808f6faf13 100644 --- a/pkgs/development/interpreters/supercollider/default.nix +++ b/pkgs/development/interpreters/supercollider/default.nix @@ -1,9 +1,12 @@ { stdenv, fetchurl, cmake, pkgconfig , jackaudio, libsndfile, fftw, curl -, libXt, qt +, libXt, qt, readline +, useSCEL ? false, emacs }: + +let optional = stdenv.lib.optional; in -stdenv.mkDerivation rec { +stdenv.mkDerivation rec { name = "supercollider-3.6.6"; meta = { @@ -24,15 +27,14 @@ stdenv.mkDerivation rec { --replace Q_WS_X11 Q_GTK_STYLE ''; - cmakeFlags = [ - "-DSC_WII=OFF" - "-DSC_EL=OFF" - ]; + cmakeFlags = '' + -DSC_WII=OFF + -DSC_EL=${if useSCEL then "ON" else "OFF"} + ''; nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ - jackaudio libsndfile fftw curl - libXt qt - ]; + buildInputs = [ + jackaudio 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 5fa278924b6a..563ccf238dda 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3544,6 +3544,8 @@ let fftw = fftwSinglePrec; }; + supercollider_scel = supercollider.override { useSCEL = true; }; + sysPerl = callPackage ../development/interpreters/perl/sys-perl { }; tcl = callPackage ../development/interpreters/tcl { }; |