diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-11-14 14:28:23 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-11-14 14:28:23 +0100 |
| commit | b4af993c3f2a2e9808b582eb6dd4500a2847fb2b (patch) | |
| tree | 6a4d51255f30e0da26fb94d4725b6c19145bb89d /pkgs/applications/audio | |
| parent | 5ad9db047327b74a4002341f074369ee736e4f9e (diff) | |
| parent | 961ed7c8b41bb80cdf5f4f0f5e49093ad171393b (diff) | |
| download | nixlib-b4af993c3f2a2e9808b582eb6dd4500a2847fb2b.tar nixlib-b4af993c3f2a2e9808b582eb6dd4500a2847fb2b.tar.gz nixlib-b4af993c3f2a2e9808b582eb6dd4500a2847fb2b.tar.bz2 nixlib-b4af993c3f2a2e9808b582eb6dd4500a2847fb2b.tar.lz nixlib-b4af993c3f2a2e9808b582eb6dd4500a2847fb2b.tar.xz nixlib-b4af993c3f2a2e9808b582eb6dd4500a2847fb2b.tar.zst nixlib-b4af993c3f2a2e9808b582eb6dd4500a2847fb2b.zip | |
Merge branch 'master' into staging
Conflicts (simple): pkgs/development/lisp-modules/clwrapper/setup-hook.sh
Diffstat (limited to 'pkgs/applications/audio')
| -rw-r--r-- | pkgs/applications/audio/caudec/default.nix | 39 | ||||
| -rw-r--r-- | pkgs/applications/audio/yoshimi/default.nix | 4 |
2 files changed, 41 insertions, 2 deletions
diff --git a/pkgs/applications/audio/caudec/default.nix b/pkgs/applications/audio/caudec/default.nix new file mode 100644 index 000000000000..24613d4dd965 --- /dev/null +++ b/pkgs/applications/audio/caudec/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchurl, makeWrapper, bash, bc, findutils, flac, lame, opusTools, procps, sox }: + +let + version = "1.7.5"; +in + +stdenv.mkDerivation rec { + name = "caudec-${version}"; + + src = fetchurl { + url = "http://caudec.net/downloads/caudec-${version}.tar.gz"; + sha256 = "5d1f5ab3286bb748bd29cbf45df2ad2faf5ed86070f90deccf71c60be832f3d5"; + }; + + preBuild = '' + patchShebangs ./install.sh + ''; + + buildInputs = [ bash makeWrapper ]; + + installPhase = '' + ./install.sh --prefix=$out/bin + ''; + + postFixup = '' + for executable in $(cd $out/bin && ls); do + wrapProgram $out/bin/$executable \ + --prefix PATH : "${bc}/bin:${findutils}/bin:${sox}/bin:${procps}/bin:${opusTools}/bin:${lame}/bin:${flac}/bin" + done + ''; + + meta = with stdenv.lib; { + homepage = http://caudec.net/; + description = "A multiprocess audio converter that supports many formats (FLAC, MP3, Ogg Vorbis, Windows codecs and many more)"; + license = licenses.gpl3; + platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ _1126 ]; + }; +} diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix index bab6cdcf33f0..96d43d77c897 100644 --- a/pkgs/applications/audio/yoshimi/default.nix +++ b/pkgs/applications/audio/yoshimi/default.nix @@ -6,11 +6,11 @@ assert stdenv ? glibc; stdenv.mkDerivation rec { name = "yoshimi-${version}"; - version = "1.2.4"; + version = "1.2.5"; src = fetchurl { url = "mirror://sourceforge/yoshimi/${name}.tar.bz2"; - sha256 = "0wz2bc0x0h989schwzqjj6sx9hvzxkw4jrkflwhyrzjini1pvkxz"; + sha256 = "0lixrxv0wds3p50kmy9k166qhavdjkhlxs432s248hk43k7n6c1h"; }; buildInputs = [ |