Merge pull request #2426 from henrytill/supercollider
supercollider: add Emacs support (aka SCEL)
This commit is contained in:
commit
a18757c0a4
@ -1,8 +1,11 @@
|
|||||||
{ stdenv, fetchurl, cmake, pkgconfig
|
{ stdenv, fetchurl, cmake, pkgconfig
|
||||||
, jackaudio, libsndfile, fftw, curl
|
, 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";
|
name = "supercollider-3.6.6";
|
||||||
|
|
||||||
@ -24,15 +27,14 @@ stdenv.mkDerivation rec {
|
|||||||
--replace Q_WS_X11 Q_GTK_STYLE
|
--replace Q_WS_X11 Q_GTK_STYLE
|
||||||
'';
|
'';
|
||||||
|
|
||||||
cmakeFlags = [
|
cmakeFlags = ''
|
||||||
"-DSC_WII=OFF"
|
-DSC_WII=OFF
|
||||||
"-DSC_EL=OFF"
|
-DSC_EL=${if useSCEL then "ON" else "OFF"}
|
||||||
];
|
'';
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake pkgconfig ];
|
nativeBuildInputs = [ cmake pkgconfig ];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
jackaudio libsndfile fftw curl
|
jackaudio libsndfile fftw curl libXt qt readline ]
|
||||||
libXt qt
|
++ optional useSCEL emacs;
|
||||||
];
|
|
||||||
}
|
}
|
||||||
|
@ -3544,6 +3544,8 @@ let
|
|||||||
fftw = fftwSinglePrec;
|
fftw = fftwSinglePrec;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
supercollider_scel = supercollider.override { useSCEL = true; };
|
||||||
|
|
||||||
sysPerl = callPackage ../development/interpreters/perl/sys-perl { };
|
sysPerl = callPackage ../development/interpreters/perl/sys-perl { };
|
||||||
|
|
||||||
tcl = callPackage ../development/interpreters/tcl { };
|
tcl = callPackage ../development/interpreters/tcl { };
|
||||||
|
Loading…
x
Reference in New Issue
Block a user