diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix index 5b2f6931ed1c..c1749029cdc9 100644 --- a/pkgs/applications/audio/ardour/default.nix +++ b/pkgs/applications/audio/ardour/default.nix @@ -4,7 +4,7 @@ , librdf_raptor, librdf_rasqal, libsamplerate, libsigcxx, libsndfile , libusb, libuuid, libxml2, libxslt, lilv, lrdf, lv2, makeWrapper , perl, pkgconfig, python2, rubberband, serd, sord, sratom -, taglib, vampSDK, dbus, fftw, pango, suil, libarchive +, taglib, vamp-plugin-sdk, dbus, fftw, pango, suil, libarchive , wafHook }: let @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { libmad libogg librdf_raptor librdf_rasqal libsamplerate libsigcxx libsndfile libusb libuuid libxml2 libxslt lilv lrdf lv2 makeWrapper pango perl pkgconfig python2 rubberband serd sord - sratom suil taglib vampSDK libarchive + sratom suil taglib vamp-plugin-sdk libarchive ]; # ardour's wscript has a "tarball" target but that required the git revision diff --git a/pkgs/applications/audio/mixxx/default.nix b/pkgs/applications/audio/mixxx/default.nix index 82db91dcb077..1247534b1e83 100644 --- a/pkgs/applications/audio/mixxx/default.nix +++ b/pkgs/applications/audio/mixxx/default.nix @@ -3,7 +3,7 @@ , libid3tag, libmad, libopus, libshout, libsndfile, libusb1, libvorbis , libGLU, libxcb, lilv, lv2, opusfile , pkgconfig, portaudio, portmidi, protobuf, qtbase, qtscript, qtsvg -, qtx11extras, rubberband, scons, sqlite, taglib, upower, vampSDK +, qtx11extras, rubberband, scons, sqlite, taglib, upower, vamp-plugin-sdk }: mkDerivation rec { @@ -20,7 +20,7 @@ mkDerivation rec { buildInputs = [ chromaprint fftw flac faad2 glibcLocales mp4v2 libid3tag libmad libopus libshout libsndfile libusb1 libvorbis libxcb libGLU lilv lv2 opusfile pkgconfig portaudio portmidi protobuf qtbase qtscript qtsvg - qtx11extras rubberband scons sqlite taglib upower vampSDK + qtx11extras rubberband scons sqlite taglib upower vamp-plugin-sdk ]; enableParallelBuilding = true; diff --git a/pkgs/applications/audio/sonic-lineup/default.nix b/pkgs/applications/audio/sonic-lineup/default.nix index 68e1b6b3f8aa..93b4c2dade4d 100644 --- a/pkgs/applications/audio/sonic-lineup/default.nix +++ b/pkgs/applications/audio/sonic-lineup/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, alsaLib, boost, bzip2, fftw, fftwFloat, libfishsound , libid3tag, liblo, libmad, liboggz, libpulseaudio, libsamplerate -, libsndfile, lrdf, opusfile, portaudio, rubberband, serd, sord, vampSDK, capnproto +, libsndfile, lrdf, opusfile, portaudio, rubberband, serd, sord, capnproto , wrapQtAppsHook, pkgconfig }: diff --git a/pkgs/applications/audio/sonic-visualiser/default.nix b/pkgs/applications/audio/sonic-visualiser/default.nix index 187c887baa55..f7803098066d 100644 --- a/pkgs/applications/audio/sonic-visualiser/default.nix +++ b/pkgs/applications/audio/sonic-visualiser/default.nix @@ -3,7 +3,7 @@ { stdenv, fetchurl, alsaLib, bzip2, fftw, libjack2, libX11, liblo , libmad, libogg, lrdf, librdf_raptor, librdf_rasqal, libsamplerate , libsndfile, pkgconfig, libpulseaudio, qtbase, qtsvg, redland -, rubberband, serd, sord, vampSDK, fftwFloat +, rubberband, serd, sord, vamp-plugin-sdk, fftwFloat , capnproto, liboggz, libfishsound, libid3tag, opusfile , wrapQtAppsHook }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ libsndfile qtbase qtsvg fftw fftwFloat bzip2 lrdf rubberband - libsamplerate vampSDK alsaLib librdf_raptor librdf_rasqal redland + libsamplerate vamp-plugin-sdk alsaLib librdf_raptor librdf_rasqal redland serd sord # optional diff --git a/pkgs/development/libraries/audio/vamp-plugin-sdk/default.nix b/pkgs/development/libraries/audio/vamp-plugin-sdk/default.nix new file mode 100644 index 000000000000..894f11b73109 --- /dev/null +++ b/pkgs/development/libraries/audio/vamp-plugin-sdk/default.nix @@ -0,0 +1,27 @@ +# set VAMP_PATH ? +# plugins availible on sourceforge and http://www.vamp-plugins.org/download.html (various licenses) + +{ stdenv, fetchFromGitHub, pkgconfig, libsndfile }: + +stdenv.mkDerivation { + name = "vamp-sdk-2.7.1"; + # version = "2.7.1"; + + src = fetchFromGitHub { + owner = "c4dm"; + repo = "vamp-plugin-sdk"; + rev = "vamp-plugin-sdk-v2.7.1"; + sha256 = "1ifd6l6b89pg83ss4gld5i72fr0cczjnl2by44z5jnndsg3sklw4"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libsndfile ]; + + meta = with stdenv.lib; { + description = "Audio processing plugin system for plugins that extract descriptive information from audio data"; + homepage = https://sourceforge.net/projects/vamp; + license = licenses.bsd3; + maintainers = [ maintainers.goibhniu maintainers.marcweber ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/audio/vamp/default.nix b/pkgs/development/libraries/audio/vamp/default.nix deleted file mode 100644 index 2ac3115af2aa..000000000000 --- a/pkgs/development/libraries/audio/vamp/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -# set VAMP_PATH ? -# plugins availible on sourceforge and http://www.vamp-plugins.org/download.html (various licenses) - -{ stdenv, fetchFromGitHub, pkgconfig, libsndfile }: - -{ - - vampSDK = stdenv.mkDerivation { - name = "vamp-sdk-2.7.1"; - # version = "2.7.1"; - - src = fetchFromGitHub { - owner = "c4dm"; - repo = "vamp-plugin-sdk"; - rev = "vamp-plugin-sdk-v2.7.1"; - sha256 = "1ifd6l6b89pg83ss4gld5i72fr0cczjnl2by44z5jnndsg3sklw4"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libsndfile ]; - - meta = with stdenv.lib; { - description = "Audio processing plugin system for plugins that extract descriptive information from audio data"; - homepage = https://sourceforge.net/projects/vamp; - license = licenses.bsd3; - maintainers = [ maintainers.goibhniu maintainers.marcweber ]; - platforms = platforms.linux; - }; - }; - -} diff --git a/pkgs/development/libraries/rubberband/default.nix b/pkgs/development/libraries/rubberband/default.nix index c9ba339ae0ea..29233a1ad3f5 100644 --- a/pkgs/development/libraries/rubberband/default.nix +++ b/pkgs/development/libraries/rubberband/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, libsamplerate, libsndfile, fftw -, vampSDK, ladspaH }: +, vamp-plugin-sdk, ladspaH }: stdenv.mkDerivation { name = "rubberband-1.8.1"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libsamplerate libsndfile fftw vampSDK ladspaH ]; + buildInputs = [ libsamplerate libsndfile fftw vamp-plugin-sdk ladspaH ]; meta = with stdenv.lib; { description = "High quality software library for audio time-stretching and pitch-shifting"; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 66fa444e0e7a..6ef668aa1401 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -509,6 +509,7 @@ mapAliases ({ v4l_utils = v4l-utils; # added 2019-08-07 v8_3_16_14 = throw "removed 2019-11-01: no longer referenced by other packages"; valadoc = throw "deprecated 2019-10-10: valadoc was merged into vala 0.38"; + vamp = { vampSDK = vamp-plugin-sdk; }; # added 2020-03-26 vimbWrapper = vimb; # added 2015-01 vimprobable2 = throw "vimprobable2 has been removed from nixpkgs. It relied on webkitgtk24x that has been removed."; # added 2019-12-05 vimprobable2-unwrapped = vimprobable2; # added 2019-12-05 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d3fac637ca8d..7676506fdafb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14393,9 +14393,7 @@ in rttr = callPackage ../development/libraries/rttr { }; - rubberband = callPackage ../development/libraries/rubberband { - inherit (vamp) vampSDK; - }; + rubberband = callPackage ../development/libraries/rubberband { }; sad = callPackage ../applications/science/logic/sad { }; @@ -14895,7 +14893,7 @@ in vale = callPackage ../tools/text/vale { }; - vamp = callPackage ../development/libraries/audio/vamp { }; + vamp-plugin-sdk = callPackage ../development/libraries/audio/vamp-plugin-sdk { }; vc = callPackage ../development/libraries/vc { }; @@ -18584,7 +18582,6 @@ in ardour = callPackage ../applications/audio/ardour { inherit (gnome2) libgnomecanvas libgnomecanvasmm; - inherit (vamp) vampSDK; }; arelle = with python3Packages; toPythonApplication arelle; @@ -20760,9 +20757,7 @@ in meh = callPackage ../applications/graphics/meh {}; - mixxx = libsForQt5.callPackage ../applications/audio/mixxx { - inherit (vamp) vampSDK; - }; + mixxx = libsForQt5.callPackage ../applications/audio/mixxx { }; mjpg-streamer = callPackage ../applications/video/mjpg-streamer { }; @@ -22011,13 +22006,9 @@ in skanlite = libsForQt5.callPackage ../applications/office/skanlite { }; - sonic-lineup = libsForQt5.callPackage ../applications/audio/sonic-lineup { - inherit (pkgs.vamp) vampSDK; - }; + sonic-lineup = libsForQt5.callPackage ../applications/audio/sonic-lineup { }; - sonic-visualiser = libsForQt5.callPackage ../applications/audio/sonic-visualiser { - inherit (pkgs.vamp) vampSDK; - }; + sonic-visualiser = libsForQt5.callPackage ../applications/audio/sonic-visualiser { }; soulseekqt = libsForQt5.callPackage ../applications/networking/p2p/soulseekqt { };