diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-05-12 04:03:33 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-05-12 04:53:38 +0200 |
commit | 6c2fbfbd7720446821be2a506cefcd1e0ff3b42d (patch) | |
tree | ef852f77f02c1636e2ee215623d6a20e87174b9e /pkgs/applications/audio | |
parent | 81df0354290389128077e00edfd2368eeeea0c24 (diff) | |
parent | 3d932ba135f9fe7eb649269543276dffa7aa563a (diff) | |
download | nixpkgs-6c2fbfbd7720446821be2a506cefcd1e0ff3b42d.tar nixpkgs-6c2fbfbd7720446821be2a506cefcd1e0ff3b42d.tar.gz nixpkgs-6c2fbfbd7720446821be2a506cefcd1e0ff3b42d.tar.bz2 nixpkgs-6c2fbfbd7720446821be2a506cefcd1e0ff3b42d.tar.lz nixpkgs-6c2fbfbd7720446821be2a506cefcd1e0ff3b42d.tar.xz nixpkgs-6c2fbfbd7720446821be2a506cefcd1e0ff3b42d.tar.zst nixpkgs-6c2fbfbd7720446821be2a506cefcd1e0ff3b42d.zip |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/applications/audio')
-rw-r--r-- | pkgs/applications/audio/cava/default.nix | 30 | ||||
-rw-r--r-- | pkgs/applications/audio/flacon/default.nix | 30 | ||||
-rw-r--r-- | pkgs/applications/audio/qjackctl/default.nix | 14 |
3 files changed, 60 insertions, 14 deletions
diff --git a/pkgs/applications/audio/cava/default.nix b/pkgs/applications/audio/cava/default.nix index 456a22ee697..39ad787c4a1 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; }; } diff --git a/pkgs/applications/audio/flacon/default.nix b/pkgs/applications/audio/flacon/default.nix new file mode 100644 index 00000000000..0f81fb45166 --- /dev/null +++ b/pkgs/applications/audio/flacon/default.nix @@ -0,0 +1,30 @@ +{ stdenv, lib, fetchFromGitHub, cmake, qt5, libuchardet, pkgconfig, makeWrapper +, shntool, flac, opusTools, vorbisTools, mp3gain, lame, wavpack, vorbisgain +}: + +stdenv.mkDerivation rec { + name = "flacon-${version}"; + version = "2.0.1"; + src = fetchFromGitHub { + owner = "flacon"; + repo = "flacon"; + rev = "v${version}"; + sha256 = "0hip411k3arb96rnd22ifs9shlv0xmy96hhx1jcwdk48kw8aa9rw"; + }; + + buildInputs = [ cmake qt5.qtbase qt5.qttools libuchardet pkgconfig makeWrapper ]; + + postInstall = '' + wrapProgram $out/bin/flacon \ + --prefix PATH : "${lib.makeBinPath [ shntool flac opusTools vorbisTools + mp3gain lame wavpack vorbisgain ]}" + ''; + + meta = { + description = "Extracts audio tracks from an audio CD image to separate tracks."; + homepage = https://flacon.github.io/; + license = stdenv.lib.licenses.lgpl21; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.nico202 ]; + }; +} diff --git a/pkgs/applications/audio/qjackctl/default.nix b/pkgs/applications/audio/qjackctl/default.nix index 90129d6404b..db73901d2aa 100644 --- a/pkgs/applications/audio/qjackctl/default.nix +++ b/pkgs/applications/audio/qjackctl/default.nix @@ -1,17 +1,23 @@ -{ stdenv, fetchurl, qt4, alsaLib, libjack2, dbus }: +{ stdenv, fetchurl, alsaLib, libjack2, dbus, qt5 }: stdenv.mkDerivation rec { - version = "0.4.0"; + version = "0.4.2"; name = "qjackctl-${version}"; # some dependencies such as killall have to be installed additionally src = fetchurl { url = "mirror://sourceforge/qjackctl/${name}.tar.gz"; - sha256 = "0nj8c8vy00524hbjqwsqkliblcf9j7h46adk6v5np645pp2iqrav"; + sha256 = "0pmgkqgkapbma42zqb5if4ngmj183rxl8bhjm7mhyhgq4bzll76g"; }; - buildInputs = [ qt4 alsaLib libjack2 dbus ]; + buildInputs = [ + qt5.full + qt5.qtx11extras + alsaLib + libjack2 + dbus + ]; configureFlags = "--enable-jack-version"; |