From 37e2338042bcfd607ce5457b3dad92b42e5cf62c Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sat, 10 Jan 2015 13:51:15 +0100 Subject: [PATCH] Update mpg321 from 0.2.13-2 to 0.3.2. Also - ensure that the man pages are installed, - add myself as maintainer, and - enable ALSA support on Linux. --- pkgs/applications/audio/mpg321/default.nix | 26 ++++++++++++++-------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/audio/mpg321/default.nix b/pkgs/applications/audio/mpg321/default.nix index 939c9f79e4d..489831dc464 100644 --- a/pkgs/applications/audio/mpg321/default.nix +++ b/pkgs/applications/audio/mpg321/default.nix @@ -1,20 +1,28 @@ -{stdenv, fetchurl, libao, libmad, libid3tag, zlib}: +{stdenv, fetchurl, libao, libmad, libid3tag, zlib, alsaLib}: stdenv.mkDerivation rec { - name = "mpg321-0.2.13-2"; + name = "mpg321-${version}"; + version = "0.3.2"; src = fetchurl { - url = "mirror://sourceforge/mpg321/0.2.13/${name}.tar.gz"; - sha256 = "0zx9xyr97frlyrwyk2msm9h1sn2b84vqaxcy5drbzcd2n585lwlx"; + url = "mirror://sourceforge/mpg321/${version}/mpg321_${version}.orig.tar.gz"; + sha256 = "0ki8mh76bbmdh77qsiw682dvi8y468yhbdabqwg05igmwc1wqvq5"; }; - buildInputs = [libao libid3tag libmad zlib]; + configureFlags = [ + ("--enable-alsa=" + (if stdenv.isLinux then "yes" else "no")) + ]; - meta = { + buildInputs = [libao libid3tag libmad zlib] + ++ stdenv.lib.optional stdenv.isLinux alsaLib; + + installTargets = "install install-man"; + + meta = with stdenv.lib; { description = "Command-line MP3 player"; homepage = http://mpg321.sourceforge.net/; - license = stdenv.lib.licenses.gpl2; - maintainers = [ ]; - platforms = stdenv.lib.platforms.gnu; + license = licenses.gpl2; + maintainers = [ maintainers.rycee ]; + platforms = platforms.gnu; }; }