Remove unused sonic-visualizer/ subdir, rename.

Also move "qt=qt4" to default.nix

svn path=/nixpkgs/trunk/; revision=28474
This commit is contained in:
Yury G. Kudryashov 2011-08-10 22:39:53 +00:00
parent 8d0fe0e19b
commit ceb301c31b
3 changed files with 8 additions and 52 deletions

View file

@ -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

View file

@ -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;
};
}

View file

@ -7140,11 +7140,12 @@ let
guile = guile_1_8;
};
sonicVisualiser = callPackage ../applications/audio/sonic-visualiser {
inherit (vamp) vampSDK;
inherit (xlibs) libX11;
qt = qt4;
fftw = fftwSinglePrec;
sonicVisualiser = builtins.trace "Use sonic_visualiser instead of sonicVisualiser" pkgs.sonic_visualiser;
sonic_visualiser = callPackage ../applications/audio/sonic-visualiser {
inherit (pkgs.vamp) vampSDK;
inherit (pkgs.xlibs) libX11;
fftw = pkgs.fftwSinglePrec;
};
sox = callPackage ../applications/misc/audio/sox { };