Author: urkud
Date: Wed Aug 10 22:39:53 2011
New Revision: 28474
URL: https://svn.nixos.org/websvn/nix/?rev=28474&sc=1
Log:
Remove unused sonic-visualizer/ subdir, rename.
Also move "qt=qt4" to default.nix
Deleted:
nixpkgs/trunk/pkgs/applications/audio/sonic-visualizer/
Modified:
nixpkgs/trunk/pkgs/applications/audio/sonic-visualiser/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/applications/audio/sonic-visualiser/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/audio/sonic-visualiser/default.nix Wed Aug
10 22:16:48 2011 (r28473)
+++ nixpkgs/trunk/pkgs/applications/audio/sonic-visualiser/default.nix Wed Aug
10 22:39:53 2011 (r28474)
@@ -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 @@
};
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
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Wed Aug 10 22:16:48
2011 (r28473)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Wed Aug 10 22:39:53
2011 (r28474)
@@ -7140,11 +7140,12 @@
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 { };
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
