diff options
| author | Andrew Abbott <mirrexagon@mirrexagon.com> | 2016-05-10 19:48:38 +1000 |
|---|---|---|
| committer | Andrew Abbott <mirrexagon@mirrexagon.com> | 2016-05-11 20:40:03 +1000 |
| commit | 90201710a2e6b803427dbedcb40f5edea24102cf (patch) | |
| tree | 974a12935a002b43b09e5b2220877b205a60d7f9 | |
| parent | 95c7dd7af9334a77c84c22326b25a0ff1a036084 (diff) | |
| download | nixlib-90201710a2e6b803427dbedcb40f5edea24102cf.tar nixlib-90201710a2e6b803427dbedcb40f5edea24102cf.tar.gz nixlib-90201710a2e6b803427dbedcb40f5edea24102cf.tar.bz2 nixlib-90201710a2e6b803427dbedcb40f5edea24102cf.tar.lz nixlib-90201710a2e6b803427dbedcb40f5edea24102cf.tar.xz nixlib-90201710a2e6b803427dbedcb40f5edea24102cf.tar.zst nixlib-90201710a2e6b803427dbedcb40f5edea24102cf.zip | |
cava: update to 0.4.1
| -rw-r--r-- | lib/maintainers.nix | 1 | ||||
| -rw-r--r-- | 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; }; } |