From c6457c322ba2af31686d503274375908e51b3fb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sun, 24 Jun 2012 16:51:42 +0200 Subject: [PATCH 1/2] Upgrading sonic-visualiser to 1.9 and adding pkgconfig so that it finds rasqal.h successfully --- pkgs/applications/audio/sonic-visualiser/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/audio/sonic-visualiser/default.nix b/pkgs/applications/audio/sonic-visualiser/default.nix index 3a2beff0413..aabddef8eac 100644 --- a/pkgs/applications/audio/sonic-visualiser/default.nix +++ b/pkgs/applications/audio/sonic-visualiser/default.nix @@ -2,15 +2,16 @@ { stdenv, fetchurl, alsaLib, bzip2, fftw, jackaudio, libX11, liblo, libmad, libogg, librdf, librdf_raptor, librdf_rasqal, libsamplerate, -libsndfile, makeWrapper, pulseaudio, qt4, redland, rubberband, vampSDK +libsndfile, makeWrapper, pkgconfig, pulseaudio, qt4, redland, rubberband, vampSDK }: -stdenv.mkDerivation { - name = "sonic-visualiser-1.8"; +stdenv.mkDerivation rec { + name = "sonic-visualiser-${version}"; + version = "1.9"; src = fetchurl { - url = http://downloads.sourceforge.net/sv1/sonic-visualiser-1.8.tar.gz; - sha256 = "16ik6q9n92wljvnqcv7hyzb9v3yp3ixxp6df9kasf53fii973dh7"; + url = "http://code.soundsoftware.ac.uk/attachments/download/194/${name}.tar.gz"; + sha256 = "00igf7j6s8xfyxnlkbqma0yby9pknxqzy8cmh0aw95ix80cw56fq"; }; buildInputs = @@ -18,6 +19,7 @@ stdenv.mkDerivation { libsamplerate vampSDK alsaLib librdf_raptor librdf_rasqal redland # optional jackaudio + pkgconfig # portaudio pulseaudio libmad From 1afe86a7b7da36cc98a2547b3f2f4da08bba7132 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sun, 24 Jun 2012 16:54:51 +0200 Subject: [PATCH 2/2] Tidy up --- .../audio/sonic-visualiser/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/audio/sonic-visualiser/default.nix b/pkgs/applications/audio/sonic-visualiser/default.nix index aabddef8eac..aeb90c09455 100644 --- a/pkgs/applications/audio/sonic-visualiser/default.nix +++ b/pkgs/applications/audio/sonic-visualiser/default.nix @@ -1,8 +1,9 @@ # TODO add plugins having various licenses, see http://www.vamp-plugins.org/download.html -{ stdenv, fetchurl, alsaLib, bzip2, fftw, jackaudio, libX11, liblo, -libmad, libogg, librdf, librdf_raptor, librdf_rasqal, libsamplerate, -libsndfile, makeWrapper, pkgconfig, pulseaudio, qt4, redland, rubberband, vampSDK +{ stdenv, fetchurl, alsaLib, bzip2, fftw, jackaudio, libX11, liblo +, libmad, libogg, librdf, librdf_raptor, librdf_rasqal, libsamplerate +, libsndfile, makeWrapper, pkgconfig, pulseaudio, qt4, redland +, rubberband, vampSDK }: stdenv.mkDerivation rec { @@ -17,9 +18,9 @@ stdenv.mkDerivation rec { buildInputs = [ libsndfile qt4 fftw /* should be fftw3f ??*/ bzip2 librdf rubberband libsamplerate vampSDK alsaLib librdf_raptor librdf_rasqal redland + pkgconfig # optional jackaudio - pkgconfig # portaudio pulseaudio libmad @@ -48,8 +49,10 @@ stdenv.mkDerivation rec { description = "View and analyse contents of music audio files"; homepage = http://www.sonicvisualiser.org/; license = "GPLv2"; - maintainers = [ stdenv.lib.maintainers.marcweber - stdenv.lib.maintainers.goibhniu ]; + maintainers = + [ stdenv.lib.maintainers.marcweber + stdenv.lib.maintainers.goibhniu + ]; platforms = stdenv.lib.platforms.linux; }; }