timbreID: 0.6.0 -> 0.7.0

2 files changed, 21 insertions, 9 deletions

diff --git a/pkgs/applications/audio/pd-plugins/timbreid/default.nix b/pkgs/applications/audio/pd-plugins/timbreid/default.nix
index f8a25256bb0..f2e54b327fc 100644
--- a/pkgs/applications/audio/pd-plugins/timbreid/default.nix
+++ b/pkgs/applications/audio/pd-plugins/timbreid/default.nix
@@ -1,30 +1,40 @@
-{ stdenv, fetchurl, unzip, puredata }:
+{ stdenv, fetchurl, unzip, puredata, fftw }:
 
 stdenv.mkDerivation rec {
-  version = "0.6.0";
+  version = "0.7.0";
   name = "timbreid-${version}";
 
   src = fetchurl {
     url = "http://williambrent.conflations.com/pd/timbreID-${version}-src.zip";
-    sha256 = "02rnkb0vpjxrr60c3hryv7zhyjpci2mi9dk27kjxpj5zp26gjk0p";
+    sha256 = "14k2xk5zrzrw1zprdbwx45hrlc7ck8vq4drpd3l455i5r8yk4y6b";
   };
 
-  buildInputs = [ unzip puredata ];
+  buildInputs = [ unzip puredata fftw ];
 
   unpackPhase = ''
+    mkdir source
+    cd source
     unzip $src
-    mv timbreID-0.6.0-src/tID/* .
-    rm -rf timbreID-0.6.0-src/tID/
-    rm -rf timbreID-0.6.0-src/INSTALL.txt
   '';
 
+  buildPhase = ''
+    make tIDLib.o all
+ '';
+
   installPhase = ''
     mkdir -p $out/
     cp -r *.pd $out/
     cp -r *.pd_linux $out/
-    cp -r *.wav $out/
+    cp -r audio/ $out/
+    cp -r data/ $out/
+    cp -r doc/ $out/
   '';
 
+  postFixup = ''
+    mv $out/share/doc/ $out/
+    rm -rf $out/share/
+    '';
+
   meta = {
     description = "A collection of audio feature analysis externals for puredata";
     homepage = http://williambrent.conflations.com/pages/research.html;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 301bcfd193d..df7f8c4dbe9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16982,7 +16982,9 @@ with pkgs;
     gtk = gtk3;
   };
 
-  timbreid = callPackage ../applications/audio/pd-plugins/timbreid { };
+  timbreid = callPackage ../applications/audio/pd-plugins/timbreid {
+    fftw = fftwSinglePrec;
+  };
 
   timescaledb = callPackage ../servers/sql/postgresql/timescaledb {};