From a611ecad177840fdba73263297ce588e7d90c5d7 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Fri, 27 Jan 2017 16:38:33 +0100
Subject: [PATCH] timidity: get rid of composableDerivation

---
 pkgs/tools/misc/timidity/default.nix | 40 +++++-----------------------
 1 file changed, 6 insertions(+), 34 deletions(-)

diff --git a/pkgs/tools/misc/timidity/default.nix b/pkgs/tools/misc/timidity/default.nix
index 710a777ffb50..a79f38464746 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}";
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ alsaLib libjack2 ncurses ];
 
-  preConfigure = ''
-    configureFlags="$configureFlags --enable-audio=$audioModes"
-  '';
+  configureFlags = [ "--enable-audio=oss,alsa,jack" "--with-default-output=alsa" "--enable-ncurses" ];
 
-  # 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]; };};
-
-  cfg = {
-    ncursesSupport = true;
-
-    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;