Author: cillian
Date: Wed May 4 23:54:03 2011
New Revision: 27154
URL: https://svn.nixos.org/websvn/nix/?rev=27154&sc=1
Log:
Updating Sonic Visualiser, it isn't getting wrapped correctly, but otherwise it
compiles and works
Added:
nixpkgs/trunk/pkgs/applications/audio/sonic-visualiser/
- copied from r27148,
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-visualizer/default.nix Wed May
4 14:59:17 2011 (r27148)
+++ nixpkgs/trunk/pkgs/applications/audio/sonic-visualiser/default.nix Wed May
4 23:54:03 2011 (r27154)
@@ -1,15 +1,16 @@
# 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, fetchurl, alsaLib, bzip2, fftw, jackaudio, libX11, liblo,
+libmad, libogg, librdf, librdf_raptor, librdf_rasqal, libsamplerate,
+libsndfile, makeWrapper, pulseaudio, qt, redland, rubberband, vampSDK
+}:
stdenv.mkDerivation {
- name = "sonic-visualizer-1.6";
+ name = "sonic-visualiser-1.8";
src = fetchurl {
- url = http://downloads.sourceforge.net/sv1/sonic-visualiser-1.6.tar.bz2;
- sha256 = "1dbqqa7anii2jnjpfwm4sr83nn4bwmz68xw4n6clycsz5iqk52f5";
+ url = http://downloads.sourceforge.net/sv1/sonic-visualiser-1.8.tar.gz;
+ sha256 = "16ik6q9n92wljvnqcv7hyzb9v3yp3ixxp6df9kasf53fii973dh7";
};
buildInputs =
@@ -25,14 +26,23 @@
liblo
];
+ # TODO: Check if this is necessary
buildPhase = ''
- qmake -makefile PREFIX=$out && make
+ for i in sonic-visualiser svapp svcore svgui;
+ do cd $i && qmake -makefile PREFIX=$out && cd ..;
+ done
+ make
'';
installPhase = ''
- ensureDir $out/{bin,share/sv}
- cp sv/sonic-visualiser $out/bin
- cp -r sv/samples $out/share/sv/samples
+ ensureDir $out/{bin,share/sonic-visualiser}
+ cp sonic-visualiser/sonic-visualiser $out/bin
+ cp -r sonic-visualiser/samples $out/share/sonic-visualiser/samples
+ '';
+
+ # TODO: Fix this, it is not getting called
+ postInstall = ''
+ wrapProgram $out/bin/sonic-visualiser --prefix LD_LIBRARY_PATH :
${libX11}/lib
'';
meta = {
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Wed May 4 18:58:53
2011 (r27153)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Wed May 4 23:54:03
2011 (r27154)
@@ -6820,9 +6820,11 @@
guile = guile_1_8;
};
- sonicVisualizer = callPackage ../applications/audio/sonic-visualizer {
+ sonicVisualiser = callPackage ../applications/audio/sonic-visualiser {
inherit (vamp) vampSDK;
+ inherit (xlibs) libX11;
qt = qt4;
+ fftw = fftwSinglePrec;
};
sox = callPackage ../applications/misc/audio/sox { };
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
