From 83b664637e9c6dc9ee25ea174f88aa83c141f1e2 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Sat, 11 Jul 2026 14:36:54 -0700
Subject: [PATCH 1/4] timbreid: move to by-name/

---
 .../timbreid/default.nix => by-name/ti/timbreid/package.nix}  | 4 ++--
 pkgs/top-level/all-packages.nix                               | 4 ----
 2 files changed, 2 insertions(+), 6 deletions(-)
 rename pkgs/{applications/audio/pd-plugins/timbreid/default.nix => by-name/ti/timbreid/package.nix} (96%)

diff --git a/pkgs/applications/audio/pd-plugins/timbreid/default.nix b/pkgs/by-name/ti/timbreid/package.nix
similarity index 96%
rename from pkgs/applications/audio/pd-plugins/timbreid/default.nix
rename to pkgs/by-name/ti/timbreid/package.nix
index 83b29d1e6f7f..b9829d5c216b 100644
--- a/pkgs/applications/audio/pd-plugins/timbreid/default.nix
+++ b/pkgs/by-name/ti/timbreid/package.nix
@@ -4,7 +4,7 @@
   fetchurl,
   unzip,
   puredata,
-  fftw,
+  fftwSinglePrec,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [ unzip ];
   buildInputs = [
     puredata
-    fftw
+    fftwSinglePrec
   ];
 
   unpackPhase = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dc70e4476e16..024b739e834d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9586,10 +9586,6 @@ with pkgs;
     versionSuffix = "esr";
   };
 
-  timbreid = callPackage ../applications/audio/pd-plugins/timbreid {
-    fftw = fftwSinglePrec;
-  };
-
   inherit
     ({
       timeshift-unwrapped = callPackage ../applications/backup/timeshift/unwrapped.nix { };

From c33f83b46f9c9d7a50eac5075a4b0bcc49afb8f5 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Sat, 11 Jul 2026 14:52:07 -0700
Subject: [PATCH 2/4] timbreid: replace explicit phases with nix flags

---
 pkgs/by-name/ti/timbreid/package.nix | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/ti/timbreid/package.nix b/pkgs/by-name/ti/timbreid/package.nix
index b9829d5c216b..827e9e407e2f 100644
--- a/pkgs/by-name/ti/timbreid/package.nix
+++ b/pkgs/by-name/ti/timbreid/package.nix
@@ -16,29 +16,28 @@ stdenv.mkDerivation (finalAttrs: {
     sha256 = "14k2xk5zrzrw1zprdbwx45hrlc7ck8vq4drpd3l455i5r8yk4y6b";
   };
 
+  sourceRoot = ".";
+
   nativeBuildInputs = [ unzip ];
   buildInputs = [
     puredata
     fftwSinglePrec
   ];
 
-  unpackPhase = ''
-    mkdir source
-    cd source
-    unzip $src
-  '';
-
-  buildPhase = ''
-    make tIDLib.o all
-  '';
+  makeFlags = [
+    "tIDLib.o"
+    "all"
+  ];
 
   installPhase = ''
+    runHook preInstall
     mkdir -p $out/
     cp -r *.pd $out/
     cp -r *.pd_linux $out/
     cp -r audio/ $out/
     cp -r data/ $out/
     cp -r doc/ $out/
+    runHook postInstall
   '';
 
   postFixup = ''

From 0d76345cd23fb2b0679a47944cb3550d67d5907c Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Sun, 12 Jul 2026 13:10:51 -0700
Subject: [PATCH 3/4] timbreid: enable parallel building

---
 pkgs/by-name/ti/timbreid/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/ti/timbreid/package.nix b/pkgs/by-name/ti/timbreid/package.nix
index 827e9e407e2f..31dca749e93f 100644
--- a/pkgs/by-name/ti/timbreid/package.nix
+++ b/pkgs/by-name/ti/timbreid/package.nix
@@ -29,6 +29,8 @@ stdenv.mkDerivation (finalAttrs: {
     "all"
   ];
 
+  enableParallelBuilding = true;
+
   installPhase = ''
     runHook preInstall
     mkdir -p $out/

From cc4f407d133ef4d5cc28acce791a1bba35f24cb2 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Sun, 12 Jul 2026 14:03:13 -0700
Subject: [PATCH 4/4] timbreid: specify gpl3Plus license

---
 pkgs/by-name/ti/timbreid/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ti/timbreid/package.nix b/pkgs/by-name/ti/timbreid/package.nix
index 31dca749e93f..d75c31eac9a9 100644
--- a/pkgs/by-name/ti/timbreid/package.nix
+++ b/pkgs/by-name/ti/timbreid/package.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Collection of audio feature analysis externals for puredata";
     homepage = "http://williambrent.conflations.com/pages/research.html";
-    license = lib.licenses.gpl3;
+    license = lib.licenses.gpl3Plus;
     maintainers = [ lib.maintainers.magnetophon ];
     platforms = lib.platforms.linux;
   };