diff --git a/pkgs/applications/audio/abcde/abcde.patch b/pkgs/applications/audio/abcde/abcde.patch deleted file mode 100644 index ae187043e6c5..000000000000 --- a/pkgs/applications/audio/abcde/abcde.patch +++ /dev/null @@ -1,30 +0,0 @@ -Two changes: - -* Add an alias for `which', so abcde can find things in store -* Choose the right CDROM reader syntax for `cd-paranoia' - ---- abcde-2.5.4/abcde~ 2012-09-18 06:09:31.000000000 -0700 -+++ abcde-2.5.4/abcde 2012-10-27 00:08:48.000862364 -0700 -@@ -17,6 +17,11 @@ - - VERSION='2.5.4' - -+which () -+{ -+ type -P $1 -+} -+ - usage () - { - echo "This is abcde v$VERSION." -@@ -3497,6 +3502,10 @@ - for DEFAULT_CDROMREADER in $DEFAULT_CDROMREADERS; do - if new_checkexec $DEFAULT_CDROMREADER; then - CDROMREADERSYNTAX=$DEFAULT_CDROMREADER -+ case "$DEFAULT_CDROMREADER" in -+ cd-paranoia) CDROMREADERSYNTAX=cdparanoia;; -+ *) CDROMREADERSYNTAX=$DEFAULT_CDROMREADER;; -+ esac - break - fi - done diff --git a/pkgs/applications/audio/abcde/default.nix b/pkgs/applications/audio/abcde/default.nix index 7f2080c6fd63..58e8ecc4fcab 100644 --- a/pkgs/applications/audio/abcde/default.nix +++ b/pkgs/applications/audio/abcde/default.nix @@ -3,60 +3,58 @@ , perl, MusicBrainz, MusicBrainzDiscID , makeWrapper }: -let version = "2.8.1"; +let version = "2.9.2"; in stdenv.mkDerivation { name = "abcde-${version}"; src = fetchurl { url = "https://abcde.einval.com/download/abcde-${version}.tar.gz"; - sha256 = "0f9bjs0phk23vry7gvh0cll9vl6kmc1y4fwwh762scfdvpbp3774"; + sha256 = "13c5yvp87ckqgha160ym5rdr1a4divgvyqbjh0yb6ffclip6qd9l"; }; # FIXME: This package does not support `distmp3', `eject', etc. - patches = [ ./abcde.patch ]; - configurePhase = '' sed -i "s|^[[:blank:]]*prefix *=.*$|prefix = $out|g ; s|^[[:blank:]]*etcdir *=.*$|etcdir = $out/etc|g ; s|^[[:blank:]]*INSTALL *=.*$|INSTALL = install -c|g" \ "Makefile"; - # We use `cd-paranoia' from GNU libcdio, which contains a hyphen - # in its name, unlike Xiph's cdparanoia. - sed -i "s|^[[:blank:]]*CDPARANOIA=.*$|CDPARANOIA=cd-paranoia|g ; - s|^[[:blank:]]*DEFAULT_CDROMREADERS=.*$|DEFAULT_CDROMREADERS=\"cd-paranoia cdda2wav\"|g" \ - "abcde" + echo 'CDPARANOIA=${libcdio-paranoia}/bin/cd-paranoia' >>abcde.conf + echo CDROMREADERSYNTAX=cdparanoia >>abcde.conf substituteInPlace "abcde" \ --replace "/etc/abcde.conf" "$out/etc/abcde.conf" - ''; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; - propagatedBuildInputs = [ perl MusicBrainz MusicBrainzDiscID ]; + buildInputs = [ perl MusicBrainz MusicBrainzDiscID ]; installFlags = [ "sysconfdir=$(out)/etc" ]; postFixup = '' for cmd in abcde cddb-tool abcde-musicbrainz-tool; do - wrapProgram "$out/bin/$cmd" --prefix PATH ":" \ - ${stdenv.lib.makeBinPath [ "$out" which libcdio-paranoia cddiscid wget vorbis-tools id3v2 eyeD3 lame flac glyr ]} + wrapProgram "$out/bin/$cmd" \ + --prefix PERL5LIB : "$PERL5LIB" \ + --prefix PATH ":" ${stdenv.lib.makeBinPath [ + "$out" which libcdio-paranoia cddiscid wget + vorbis-tools id3v2 eyeD3 lame flac glyr + ]} done ''; - meta = { + meta = with stdenv.lib; { homepage = http://abcde.einval.com/wiki/; - license = stdenv.lib.licenses.gpl2Plus; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ gebner ]; description = "Command-line audio CD ripper"; - longDescription = '' abcde is a front-end command-line utility (actually, a shell script) that grabs tracks off a CD, encodes them to Ogg/Vorbis, MP3, FLAC, Ogg/Speex and/or MPP/MP+ (Musepack) format, and tags them, all in one go. ''; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; }; }