From 90201710a2e6b803427dbedcb40f5edea24102cf Mon Sep 17 00:00:00 2001
From: Andrew Abbott <mirrexagon@mirrexagon.com>
Date: Tue, 10 May 2016 19:48:38 +1000
Subject: cava: update to 0.4.1

---
 lib/maintainers.nix                      |  1 +
 pkgs/applications/audio/cava/default.nix | 30 ++++++++++++++++++++----------
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index b4cdd7683207..85ed496ad762 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -237,6 +237,7 @@
   michelk = "Michel Kuhlmann <michel@kuhlmanns.info>";
   mingchuan = "Ming Chuan <ming@culpring.com>";
   mirdhyn = "Merlin Gaillard <mirdhyn@gmail.com>";
+  mirrexagon = "Andrew Abbott <mirrexagon@mirrexagon.com>";
   modulistic = "Pablo Costa <modulistic@gmail.com>";
   mog = "Matthew O'Gorman <mog-lists@rldn.net>";
   moosingin3space = "Nathan Moos <moosingin3space@gmail.com>";
diff --git a/pkgs/applications/audio/cava/default.nix b/pkgs/applications/audio/cava/default.nix
index 456a22ee697a..39ad787c4a14 100644
--- a/pkgs/applications/audio/cava/default.nix
+++ b/pkgs/applications/audio/cava/default.nix
@@ -1,26 +1,36 @@
-{ stdenv, fetchgit, alsaLib, fftw }:
+{ stdenv, fetchFromGitHub, autoreconfHook, alsaLib, fftw,
+  libpulseaudio, ncurses }:
 
 stdenv.mkDerivation rec {
   name = "cava-${version}";
-  version = "27dbdf47daae44c780db9998c760007b3bf63738";
+  version = "0.4.1";
 
-  buildInputs = [ alsaLib fftw ];
+  buildInputs = [
+    alsaLib
+    fftw
+    libpulseaudio
+    ncurses
+  ];
 
-  src = fetchgit {
-    url = "https://github.com/karlstav/cava";
+  src = fetchFromGitHub {
+    owner = "karlstav";
+    repo = "cava";
     rev = version;
-    sha256 = "1a61e2c869376276cf78e6446cd1cc7f96b3e378fa8bc0bc4c5ca81945429909";
+    sha256 = "157hw4cn3qjic7ymn5vy67paxmzssc33h1zswx72ss7j6nc8707f";
   };
 
-  installPhase = ''
-    mkdir -p $out/bin
-    cp cava $out/bin
+  nativeBuildInputs = [ autoreconfHook ];
+
+  postConfigure = ''
+    substituteInPlace Makefile \
+      --replace "-L/usr/local/lib -Wl,-rpath /usr/local/lib" ""
   '';
 
   meta = with stdenv.lib; {
     description = "Console-based Audio Visualizer for Alsa";
     homepage = https://github.com/karlstav/cava;
-    maintainers = with maintainers; [offline];
+    license = licenses.mit;
+    maintainers = with maintainers; [ offline mirrexagon ];
     platforms = platforms.linux;
   };
 }
-- 
cgit 1.4.1