3
0
Fork 0
forked from mirrors/nixpkgs

vorbis-tools: rename from old-style vorbisTools

This commit is contained in:
Tobias Geerinckx-Rice 2016-01-26 00:53:13 +01:00
parent 1bfe78be71
commit 0c25292648
11 changed files with 23 additions and 22 deletions

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, libcdio, cddiscid, wget, bash, vorbisTools, id3v2, eyeD3
{ stdenv, fetchurl, libcdio, cddiscid, wget, bash, vorbis-tools, id3v2, eyeD3
, lame, flac, eject, mkcue
, perl, DigestSHA, MusicBrainz, MusicBrainzDiscID
, makeWrapper }:
@ -50,7 +50,7 @@ in
--replace '#!/usr/bin/perl' '#!${perl}/bin/perl'
wrapProgram "$out/bin/abcde" --prefix PATH ":" \
"$out/bin:${libcdio}/bin:${cddiscid}/bin:${wget}/bin:${vorbisTools}/bin:${id3v2}/bin:${eyeD3}/bin:${lame}/bin"
"$out/bin:${libcdio}/bin:${cddiscid}/bin:${wget}/bin:${vorbis-tools}/bin:${id3v2}/bin:${eyeD3}/bin:${lame}/bin"
wrapProgram "$out/bin/cddb-tool" --prefix PATH ":" \
"${wget}/bin"

View file

@ -1,6 +1,6 @@
{ stdenv, fetchurl, makeWrapper, SDL , alsaLib, gtk, libjack2, ladspaH
, ladspaPlugins, libsamplerate, libsndfile, pkgconfig, libpulseaudio, lame
, vorbisTools }:
, vorbis-tools }:
stdenv.mkDerivation rec {
name = "mhwaveedit-${version}";
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
postInstall = ''
wrapProgram $out/bin/mhwaveedit \
--prefix PATH : ${lame}/bin/ \
--prefix PATH : ${vorbisTools}/bin/
--prefix PATH : ${vorbis-tools}/bin/
'';
meta = with stdenv.lib; {

View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, emacs, texinfo
, mpg321, vorbisTools, taglib, mp3info, alsaUtils }:
, mpg321, vorbis-tools, taglib, mp3info, alsaUtils }:
# XXX: EMMS also supports Xine, MPlayer, Jack, etc.
@ -25,9 +25,9 @@ stdenv.mkDerivation rec {
sed -i "emms-player-mpg321-remote.el" \
-e 's|emms-player-mpg321-remote-command[[:blank:]]\+"mpg321"|emms-player-mpg321-remote-command "${mpg321}/bin/mpg321"|g'
sed -i "emms-player-simple.el" \
-e 's|"ogg123"|"${vorbisTools}/bin/ogg123"|g'
-e 's|"ogg123"|"${vorbis-tools}/bin/ogg123"|g'
sed -i "emms-info-ogginfo.el" \
-e 's|emms-info-ogginfo-program-name[[:blank:]]\+"ogginfo"|emms-info-ogginfo-program-name "${vorbisTools}/bin/ogginfo"|g'
-e 's|emms-info-ogginfo-program-name[[:blank:]]\+"ogginfo"|emms-info-ogginfo-program-name "${vorbis-tools}/bin/ogginfo"|g'
sed -i "emms-info-libtag.el" \
-e "s|\"emms-print-metadata\"|\"$out/bin/emms-print-metadata\"|g"
sed -i "emms-volume-amixer.el" \

View file

@ -1,10 +1,10 @@
{ stdenv, fetchurl, writeScript, cdrtools, dvdauthor, ffmpeg, imagemagick, lame, mjpegtools, sox, transcode, vorbisTools }:
{ stdenv, fetchurl, writeScript, cdrtools, dvdauthor, ffmpeg, imagemagick, lame, mjpegtools, sox, transcode, vorbis-tools }:
let
wrapper = writeScript "dvd-slideshow.sh" ''
#!/bin/bash
# wrapper script for dvd-slideshow programs
export PATH=${cdrtools}/bin:${dvdauthor}/bin:${ffmpeg}/bin:${imagemagick}/bin:${lame}/bin:${mjpegtools}/bin:${sox}/bin:${transcode}/bin:${vorbisTools}/bin:$PATH
export PATH=${cdrtools}/bin:${dvdauthor}/bin:${ffmpeg}/bin:${imagemagick}/bin:${lame}/bin:${mjpegtools}/bin:${sox}/bin:${transcode}/bin:${vorbis-tools}/bin:$PATH
dir=`dirname "$0"`
exe=`basename "$0"`

View file

@ -1,6 +1,6 @@
# alsaLib vorbisTools python can be made optional
# alsaLib vorbis-tools python can be made optional
{ stdenv, fetchurl, python, tcl, tk, vorbisTools, pkgconfig, xlibsWrapper }:
{ stdenv, fetchurl, python, tcl, tk, vorbis-tools, pkgconfig, xlibsWrapper }:
stdenv.mkDerivation {
name = "snack-2.2.10";
@ -14,7 +14,7 @@ stdenv.mkDerivation {
postUnpack = ''sourceRoot="$sourceRoot/unix"'';
buildInputs = [ python tcl tk vorbisTools pkgconfig xlibsWrapper ];
buildInputs = [ python tcl tk vorbis-tools pkgconfig xlibsWrapper ];
postInstall = "aoeu";

View file

@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, python, pygtk, gettext, texinfo
, ghostscript, pysqlite, librsvg, gdk_pixbuf, txt2man, timidity, mpg123
, alsaUtils, vorbisTools, csound, lilypond
, alsaUtils, vorbis-tools, csound, lilypond
, makeWrapper
}:
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
sed -i -e 's|wav_player=.*|wav_player=${alsaUtils}/bin/aplay|' \
-e 's|midi_player=.*|midi_player=${timidity}/bin/timidity|' \
-e 's|mp3_player=.*|mp3_player=${mpg123}/bin/mpg123|' \
-e 's|ogg_player=.*|ogg_player=${vorbisTools}/bin/ogg123|' \
-e 's|ogg_player=.*|ogg_player=${vorbis-tools}/bin/ogg123|' \
-e 's|csound=.*|csound=${csound}/bin/csound|' \
-e 's|lilypond-book=.*|lilypond-book=${lilypond}/bin/lilypond-book|' \
default.config

View file

@ -1,6 +1,6 @@
{ stdenv, fetchurl, utillinux
, cdparanoia, cdrdao, dvdplusrwtools, flac, lame, mpg123, normalize
, vorbisTools, xorriso }:
, vorbis-tools, xorriso }:
stdenv.mkDerivation rec {
name = "bashburn-${version}";
@ -25,8 +25,8 @@ stdenv.mkDerivation rec {
BB_READCD=${xorriso}/bin/"xorriso -as mkisofs" \
BB_MP3ENC=${lame}/bin/lame \
BB_MP3DEC=${mpg123}/bin/mpg123 \
BB_OGGENC=${vorbisTools}/bin/oggenc \
BB_OGGDEC=${vorbisTools}/bin/oggdec \
BB_OGGENC=${vorbis-tools}/bin/oggenc \
BB_OGGDEC=${vorbis-tools}/bin/oggdec \
BB_FLACCMD=${flac}/bin/flac \
BB_EJECT=${utillinux}/bin/eject \
BB_NORMCMD=${normalize}/bin/normalize \

View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, autoreconfHook
, bison, flac, flex, id3v2, vorbisTools
, bison, flac, flex, id3v2, vorbis-tools
}:
stdenv.mkDerivation rec {
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook ];
buildInputs = [ bison flac flex id3v2 vorbisTools ];
buildInputs = [ bison flac flex id3v2 vorbis-tools ];
meta = with stdenv.lib; {
description = "A set of utilities for working with cue files and toc files";

View file

@ -13657,7 +13657,7 @@ let
VoiceOfFaust = callPackage ../applications/audio/VoiceOfFaust { };
vorbisTools = callPackage ../applications/audio/vorbis-tools { };
vorbis-tools = callPackage ../applications/audio/vorbis-tools { };
vue = callPackage ../applications/misc/vue { };
@ -15973,6 +15973,7 @@ aliases = with self; rec {
quake3game = ioquake3; # added 2016-01-14
scim = sc-im; # added 2016-01-22
dwarf_fortress = dwarf-fortress; # added 2016-01-23
vorbisTools = vorbis-tools; # added 2016-01-26
};
tweakAlias = _n: alias: with lib;

View file

@ -11278,7 +11278,7 @@ in modules // {
};
# Needed for tests only
buildInputs = [ pkgs.faad2 pkgs.flac pkgs.vorbisTools pkgs.liboggz ];
buildInputs = [ pkgs.faad2 pkgs.flac pkgs.vorbis-tools pkgs.liboggz ];
meta = {
description = "Python multimedia tagging library";

View file

@ -210,7 +210,7 @@ let
vice = linux;
vimHugeX = linux;
vncrec = linux;
vorbisTools = linux;
vorbis-tools = linux;
vsftpd = linux;
w3m = all;
weechat = linux;