diff options
author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2011-08-10 22:39:53 +0000 |
---|---|---|
committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2011-08-10 22:39:53 +0000 |
commit | ceb301c31bccb4bf1158e23f96241d5a49955439 (patch) | |
tree | af3f70d621091595dee0bd5d4b0012f766cd9453 /pkgs/applications/audio | |
parent | 8d0fe0e19bc842bc493abb75a0aafca87c93b365 (diff) |
Remove unused sonic-visualizer/ subdir, rename.
Also move "qt=qt4" to default.nix svn path=/nixpkgs/trunk/; revision=28474
Diffstat (limited to 'pkgs/applications/audio')
-rw-r--r-- | pkgs/applications/audio/sonic-visualiser/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/audio/sonic-visualizer/default.nix | 45 |
2 files changed, 2 insertions, 47 deletions
diff --git a/pkgs/applications/audio/sonic-visualiser/default.nix b/pkgs/applications/audio/sonic-visualiser/default.nix index e6566c81eb76b..d3ac4c4168c8f 100644 --- a/pkgs/applications/audio/sonic-visualiser/default.nix +++ b/pkgs/applications/audio/sonic-visualiser/default.nix @@ -2,7 +2,7 @@ { stdenv, fetchurl, alsaLib, bzip2, fftw, jackaudio, libX11, liblo, libmad, libogg, librdf, librdf_raptor, librdf_rasqal, libsamplerate, -libsndfile, makeWrapper, pulseaudio, qt, redland, rubberband, vampSDK +libsndfile, makeWrapper, pulseaudio, qt4, redland, rubberband, vampSDK }: stdenv.mkDerivation { @@ -14,7 +14,7 @@ stdenv.mkDerivation { }; buildInputs = - [ libsndfile qt fftw /* should be fftw3f ??*/ bzip2 librdf rubberband + [ libsndfile qt4 fftw /* should be fftw3f ??*/ bzip2 librdf rubberband libsamplerate vampSDK alsaLib librdf_raptor librdf_rasqal redland # optional jackaudio diff --git a/pkgs/applications/audio/sonic-visualizer/default.nix b/pkgs/applications/audio/sonic-visualizer/default.nix deleted file mode 100644 index 6e40baa1c3604..0000000000000 --- a/pkgs/applications/audio/sonic-visualizer/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -# TODO add plugins having various licenses, see http://www.vamp-plugins.org/download.html - -{ stdenv, fetchurl, libsndfile, qt, fftw, librdf, rubberband -, libsamplerate, vampSDK, alsaLib, librdf_raptor, librdf_rasqal -, redland, jackaudio, pulseaudio, libmad, libogg, liblo, bzip2 }: - -stdenv.mkDerivation { - name = "sonic-visualizer-1.6"; - - src = fetchurl { - url = http://downloads.sourceforge.net/sv1/sonic-visualiser-1.6.tar.bz2; - sha256 = "1dbqqa7anii2jnjpfwm4sr83nn4bwmz68xw4n6clycsz5iqk52f5"; - }; - - buildInputs = - [ libsndfile qt fftw /* should be fftw3f ??*/ bzip2 librdf rubberband - libsamplerate vampSDK alsaLib librdf_raptor librdf_rasqal redland - # optional - jackaudio - # portaudio - pulseaudio - libmad - libogg # ? - # fishsound - liblo - ]; - - buildPhase = '' - qmake -makefile PREFIX=$out && make - ''; - - installPhase = '' - ensureDir $out/{bin,share/sv} - cp sv/sonic-visualiser $out/bin - cp -r sv/samples $out/share/sv/samples - ''; - - meta = { - description = "View and analyse contents of music audio files"; - homepage = http://www.sonicvisualiser.org/; - license = "GPLv2"; - maintainers = [ stdenv.lib.maintainers.marcweber ]; - platforms = stdenv.lib.platforms.linux; - }; -} |