diff options
author | Shea Levy <shea@shealevy.com> | 2014-03-24 12:01:20 -0400 |
---|---|---|
committer | Shea Levy <shea@shealevy.com> | 2014-03-24 12:01:20 -0400 |
commit | ff6febb75da2d0a5d822b517c8f3e82d1ef75d92 (patch) | |
tree | 5bf00626da256cd3b8793e4591187e1c7c2a5f93 | |
parent | 84fba566f148543f06255e447225fae554b6a2c2 (diff) |
sox: Update, get rid of composableDerivation
-rw-r--r-- | pkgs/applications/misc/audio/sox/default.nix | 57 |
1 files changed, 20 insertions, 37 deletions
diff --git a/pkgs/applications/misc/audio/sox/default.nix b/pkgs/applications/misc/audio/sox/default.nix index 50aa92f8d293..570699fb619e 100644 --- a/pkgs/applications/misc/audio/sox/default.nix +++ b/pkgs/applications/misc/audio/sox/default.nix @@ -1,48 +1,31 @@ -{ composableDerivation, lib, fetchurl, alsaLib, libao, lame, libmad }: - -let inherit (composableDerivation) edf; in - -composableDerivation.composableDerivation {} { - name = "sox-14.3.0"; +{ stdenv, fetchurl +, enableAlsa ? true, alsaLib ? null +, enableLibao ? true, libao ? null +, enableLame ? false, lame ? null +, enableLibmad ? true, libmad ? null +, enableLibogg ? true, libogg ? null, libvorbis ? null +}: +let + inherit (stdenv.lib) optional optionals; +in stdenv.mkDerivation rec { + name = "sox-14.4.1"; src = fetchurl { - url = mirror://sourceforge/sox/sox-14.3.0.tar.gz; - sha256 = "15r39dq9nlwrypm0vpxmbxyqqv0bd6284djbi1fdfrlkjhf43gws"; + url = "mirror://sourceforge/sox/${name}.tar.gz"; + sha256 = "16x8gykfjdhxg0kdxwzcwgwpm5caa08y2mx18siqsq0ywmpjr34s"; }; - flags = - # are these options of interest? We'll see - #--disable-fftw disable usage of FFTW - #--enable-debug enable debugging - #--disable-cpu-clip disable tricky cpu specific clipper - edf { name = "alsa"; enable = { buildInputs = [alsaLib]; }; } - // edf { name = "libao"; enable = { buildInputs = [libao]; }; } - // edf { name = "oss"; } - // edf { name = "sun_audio"; } - // edf { name = "dl-lame"; enable.buildInputs = [ lame ]; } # use shared library - // edf { name = "lame"; enable.buildInputs = [ lame ]; } - // edf { name = "dl-mad"; enable.buildInputs = [ libmad ]; } # use shared library - // edf { name = "mad"; enable.buildInputs =[ libmad ]; } - ; - - cfg = { - ossSupport = false; - sun_audioSupport = false; - } // lib.listToAttrs - [ { name = "dl-lameSupport"; value = true; } - { name = "dl-madSupport"; value = true; } - ]; - - configureFlags = ["-enable-dl-lame"]; - - optionals = [ "libsndfile" "libogg" "flac" "ffmpeg" "libmad" "lame" - /* "amr-wb" "amr-nb" */ - "libsamplerate" /* "ladspa" */ ]; + buildInputs = + (optional enableAlsa alsaLib) ++ + (optional enableLibao libao) ++ + (optional enableLame lame) ++ + (optional enableLibmad libmad) ++ + (optionals enableLibogg [ libogg libvorbis ]); meta = { description = "Sample Rate Converter for audio"; homepage = http://www.mega-nerd.com/SRC/index.html; - maintainers = [lib.maintainers.marcweber]; + maintainers = [stdenv.lib.maintainers.marcweber stdenv.lib.maintainers.shlevy]; # you can choose one of the following licenses: license = [ "GPL" |