From 864c75b7fdb4e6716ae765d8e0aec9171dac6c2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <goibhniu@fsfe.org>
Date: Thu, 20 Feb 2014 23:33:37 +0100
Subject: [PATCH] guitarix: update from 0.25.2 to 0.28.3

Add new required inputs: lv2 and avahi, tidy up
---
 pkgs/applications/audio/guitarix/default.nix | 26 +++++++++++---------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix
index 17d53a621ca6..868fbc2cbc4b 100644
--- a/pkgs/applications/audio/guitarix/default.nix
+++ b/pkgs/applications/audio/guitarix/default.nix
@@ -1,19 +1,21 @@
-{ stdenv, fetchurl, python, gettext, intltool, pkgconfig, jackaudio, libsndfile
-, glib, gtk, glibmm, gtkmm, fftw, librdf, ladspaH, boost }:
+{ stdenv, fetchurl, avahi, boost fftw, gettext, glib, glibmm, gtk
+, gtkmm, intltool, jackaudio, ladspaH, librdf, libsndfile lv2 
+, pkgconfig, python
+}:
 
 stdenv.mkDerivation rec {
   name = "guitarix-${version}";
-  version = "0.25.2";
+  version = "0.28.3";
 
   src = fetchurl {
     url = "mirror://sourceforge/guitarix/guitarix2-${version}.tar.bz2";
-    sha256 = "1wcg3yc2iy72hj6z9l88393f00by0iwhhn8xrc3q55p4rj0mnrga";
+    sha256 = "0ks5avylyicqfj9l1wf4gj62i8m6is2jmp0h11h5l2wbg3xiwxjd";
   };
 
-  buildInputs =
-    [ python gettext intltool pkgconfig jackaudio libsndfile glib gtk glibmm
-      gtkmm fftw librdf ladspaH boost
-    ];
+  buildInputs = [
+    avahi boost fftw gettext glib glibmm gtk gtkmm intltool jackaudio
+    ladspaH librdf libsndfile lv2 pkgconfig python
+  ];
 
   configurePhase = "python waf configure --prefix=$out";
 
@@ -21,7 +23,7 @@ stdenv.mkDerivation rec {
 
   installPhase = "python waf install";
 
-  meta = { 
+  meta = with stdenv.lib; { 
     description = "A virtual guitar amplifier for Linux running with JACK";
     longDescription = ''
         guitarix is a virtual guitar amplifier for Linux running with
@@ -46,8 +48,8 @@ stdenv.mkDerivation rec {
       crazy sounds never heard before.
     '';
     homepage = http://guitarix.sourceforge.net/;
-    license = stdenv.lib.licenses.gpl3Plus;
-    maintainers = [ stdenv.lib.maintainers.astsmtl ];
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ astsmtl goibhniu ];
+    platforms = platforms.linux;
   };
 }