diff options
author | Robin Gloster <mail@glob.in> | 2017-01-27 16:38:33 +0100 |
---|---|---|
committer | Robin Gloster <mail@glob.in> | 2017-01-27 17:36:43 +0100 |
commit | a611ecad177840fdba73263297ce588e7d90c5d7 (patch) | |
tree | 4b60f3a2f2e2f9d96de5ed2d71cccb856f0f880c | |
parent | 0cd1f6bb51779d2722931e188f3c94e5366ce32d (diff) |
timidity: get rid of composableDerivation
-rw-r--r-- | pkgs/tools/misc/timidity/default.nix | 40 |
1 files changed, 6 insertions, 34 deletions
diff --git a/pkgs/tools/misc/timidity/default.nix b/pkgs/tools/misc/timidity/default.nix index 710a777ffb508..a79f38464746c 100644 --- a/pkgs/tools/misc/timidity/default.nix +++ b/pkgs/tools/misc/timidity/default.nix @@ -1,9 +1,6 @@ -{ composableDerivation, stdenv, fetchurl, alsaLib, libjack2, ncurses }: - -let inherit (composableDerivation) edf; in - -composableDerivation.composableDerivation {} { +{ stdenv, fetchurl, alsaLib, libjack2, ncurses, pkgconfig }: +stdenv.mkDerivation { name = "timidity-2.14.0"; src = fetchurl { @@ -11,37 +8,12 @@ composableDerivation.composableDerivation {} { sha256 = "0xk41w4qbk23z1fvqdyfblbz10mmxsllw0svxzjw5sa9y11vczzr"; }; - mergeAttrBy.audioModes = a : b : "${a},${b}"; - - preConfigure = '' - 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"]; - }; - } // edf { name = "ncurses"; enable = { buildInputs = [ncurses]; };}; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ alsaLib libjack2 ncurses ]; - cfg = { - ncursesSupport = true; + configureFlags = [ "--enable-audio=oss,alsa,jack" "--with-default-output=alsa" "--enable-ncurses" ]; - ossSupport = true; - alsaSupport = true; - jackSupport = true; - }; + NIX_LDFLAGS = ["-ljack -L${libjack2}/lib"]; instruments = fetchurl { url = http://www.csee.umbc.edu/pub/midia/instruments.tar.gz; |