timidity: get rid of composableDerivation

This commit is contained in:
Robin Gloster 2017-01-27 16:38:33 +01:00
parent 0cd1f6bb51
commit a611ecad17
No known key found for this signature in database
GPG Key ID: 5E4C836C632C2882

View File

@ -1,9 +1,6 @@
{ composableDerivation, stdenv, fetchurl, alsaLib, libjack2, ncurses }: { stdenv, fetchurl, alsaLib, libjack2, ncurses, pkgconfig }:
let inherit (composableDerivation) edf; in
composableDerivation.composableDerivation {} {
stdenv.mkDerivation {
name = "timidity-2.14.0"; name = "timidity-2.14.0";
src = fetchurl { src = fetchurl {
@ -11,37 +8,12 @@ composableDerivation.composableDerivation {} {
sha256 = "0xk41w4qbk23z1fvqdyfblbz10mmxsllw0svxzjw5sa9y11vczzr"; sha256 = "0xk41w4qbk23z1fvqdyfblbz10mmxsllw0svxzjw5sa9y11vczzr";
}; };
mergeAttrBy.audioModes = a : b : "${a},${b}"; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ alsaLib libjack2 ncurses ];
preConfigure = '' configureFlags = [ "--enable-audio=oss,alsa,jack" "--with-default-output=alsa" "--enable-ncurses" ];
configureFlags="$configureFlags --enable-audio=$audioModes"
'';
# configure still has many more options...
flags = {
oss = {
audioModes = "oss";
};
alsa = {
audioModes = "alsa";
buildInputs = [alsaLib];
# this is better than /dev/dsp !
configureFlags = ["--with-default-output-mode=alsa"];
};
jack = {
audioModes = "jack";
buildInputs = [libjack2];
NIX_LDFLAGS = ["-ljack -L${libjack2}/lib"]; NIX_LDFLAGS = ["-ljack -L${libjack2}/lib"];
};
} // edf { name = "ncurses"; enable = { buildInputs = [ncurses]; };};
cfg = {
ncursesSupport = true;
ossSupport = true;
alsaSupport = true;
jackSupport = true;
};
instruments = fetchurl { instruments = fetchurl {
url = http://www.csee.umbc.edu/pub/midia/instruments.tar.gz; url = http://www.csee.umbc.edu/pub/midia/instruments.tar.gz;