lol

audacity: minor update, prefer system-wide libs

- Using system-wide libs where we have them (except for portaudio, which
I couldn't make work).
- Add the soxr library (now the preferred way of audio resampling).

+41 -7
+19 -7
pkgs/applications/audio/audacity/default.nix
··· 1 1 { stdenv, fetchurl, wxGTK, pkgconfig, gettext, gtk, glib, zlib, perl, intltool, 2 - libogg, libvorbis, libmad, alsaLib, libsndfile, libsamplerate, flac, lame, 3 - expat, id3lib, ffmpeg, portaudio 2 + libogg, libvorbis, libmad, alsaLib, libsndfile, soxr, flac, lame, 3 + expat, libid3tag, ffmpeg /*, portaudio - given up fighting their portaudio.patch */ 4 4 }: 5 5 6 6 stdenv.mkDerivation rec { 7 - version = "2.0.2"; 7 + version = "2.0.3"; 8 8 name = "audacity-${version}"; 9 9 10 10 src = fetchurl { 11 - url = "http://audacity.googlecode.com/files/audacity-minsrc-${version}.tar.bz2"; 12 - sha256 = "17c7p5jww5zcg2k2fs1751mv5kbadcmgicszi1zxwj2p5b35x2mc"; 11 + url = "http://audacity.googlecode.com/files/audacity-minsrc-${version}.tar.xz"; 12 + sha256 = "1k4bbxhpfl80vm3gm3jxqly0syqjij5kwziy4xyq2c8aj2miwj1f"; 13 13 }; 14 - buildInputs = [ pkgconfig wxGTK libsndfile expat alsaLib libsamplerate 15 - libvorbis libmad flac id3lib ffmpeg gettext ]; 14 + 15 + preConfigure = /* we prefer system-wide libs */ '' 16 + mv lib-src lib-src-rm 17 + mkdir lib-src 18 + mv lib-src-rm/{Makefile*,lib-widget-extra,portaudio-v19,portmixer,portsmf,FileDialog,sbsms} lib-src/ 19 + rm -r lib-src-rm/ 20 + ''; 21 + 22 + buildInputs = [ 23 + pkgconfig gettext wxGTK gtk expat alsaLib 24 + libsndfile soxr libid3tag 25 + ffmpeg libmad lame libvorbis flac 26 + ]; #ToDo: soundtouch, detach sbsms 16 27 17 28 dontDisableStatic = true; 29 + doCheck = true; 18 30 19 31 meta = { 20 32 description = "Sound editor with graphical UI";
+20
pkgs/applications/misc/audio/soxr/default.nix
··· 1 + { stdenv, fetchurl, cmake }: 2 + 3 + stdenv.mkDerivation rec { 4 + name = "soxr-0.1.1"; 5 + 6 + src = fetchurl { 7 + url = "mirror://sourceforge/soxr/${name}-Source.tar.xz"; 8 + sha256 = "1hmadwqfpg15vhwq9pa1sl5xslibrjpk6hpq2s9hfmx1s5l6ihfw"; 9 + }; 10 + 11 + preConfigure = ''export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:"`pwd`/build/src''; 12 + 13 + buildInputs = [ cmake ]; 14 + 15 + meta = { 16 + description = "An audio resampling library"; 17 + homepage = http://soxr.sourceforge.net; 18 + license = "LGPLv2.1+"; 19 + }; 20 + }
+2
pkgs/top-level/all-packages.nix
··· 7999 7999 8000 8000 sox = callPackage ../applications/misc/audio/sox { }; 8001 8001 8002 + soxr = callPackage ../applications/misc/audio/soxr { }; 8003 + 8002 8004 spotify = callPackage ../applications/audio/spotify { 8003 8005 inherit (gnome) GConf; 8004 8006 };