diff --git a/pkgs/applications/audio/pd-plugins/timbreid/default.nix b/pkgs/by-name/ti/timbreid/package.nix similarity index 80% rename from pkgs/applications/audio/pd-plugins/timbreid/default.nix rename to pkgs/by-name/ti/timbreid/package.nix index 83b29d1e6f7f..d75c31eac9a9 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: { @@ -16,29 +16,30 @@ stdenv.mkDerivation (finalAttrs: { sha256 = "14k2xk5zrzrw1zprdbwx45hrlc7ck8vq4drpd3l455i5r8yk4y6b"; }; + sourceRoot = "."; + nativeBuildInputs = [ unzip ]; buildInputs = [ puredata - fftw + fftwSinglePrec ]; - unpackPhase = '' - mkdir source - cd source - unzip $src - ''; + makeFlags = [ + "tIDLib.o" + "all" + ]; - buildPhase = '' - make tIDLib.o all - ''; + enableParallelBuilding = true; 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 = '' @@ -49,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; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 40b8b3c09319..73ab09a75de3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9489,10 +9489,6 @@ with pkgs; versionSuffix = "esr"; }; - timbreid = callPackage ../applications/audio/pd-plugins/timbreid { - fftw = fftwSinglePrec; - }; - inherit ({ timeshift-unwrapped = callPackage ../applications/backup/timeshift/unwrapped.nix { };