Author: urkud Date: Fri Jul 30 20:17:37 2010 New Revision: 22831 URL: https://svn.nixos.org/websvn/nix/?rev=22831&sc=1
Log: Add libsndfile and fftw support to libsamplerate Modified: nixpkgs/trunk/pkgs/development/libraries/libsamplerate/default.nix nixpkgs/trunk/pkgs/top-level/all-packages.nix Modified: nixpkgs/trunk/pkgs/development/libraries/libsamplerate/default.nix ============================================================================== --- nixpkgs/trunk/pkgs/development/libraries/libsamplerate/default.nix Fri Jul 30 19:45:07 2010 (r22830) +++ nixpkgs/trunk/pkgs/development/libraries/libsamplerate/default.nix Fri Jul 30 20:17:37 2010 (r22831) @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, pkgconfig, fftw, libsndfile }: stdenv.mkDerivation rec { name = "libsamplerate-0.1.7"; @@ -8,17 +8,13 @@ sha256 = "1m1iwzpcny42kcqv5as2nyb0ggrb56wzckpximqpp2y74dipdf4q"; }; + buildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ fftw libsndfile ]; + # maybe interesting configure flags: #--disable-fftw disable usage of FFTW #--disable-cpu-clip disable tricky cpu specific clipper - configurePhase = - '' - export LIBSAMPLERATE_CFLAGS="-I $libsamplerate/include" - export LIBSAMPLERATE_LIBS="-L $libsamplerate/libs" - ./configure --prefix=$out - ''; - meta = { description = "Sample Rate Converter for audio"; homepage = http://www.mega-nerd.com/SRC/index.html; Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix ============================================================================== --- nixpkgs/trunk/pkgs/top-level/all-packages.nix Fri Jul 30 19:45:07 2010 (r22830) +++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Fri Jul 30 20:17:37 2010 (r22831) @@ -4684,7 +4684,7 @@ }; libsamplerate = import ../development/libraries/libsamplerate { - inherit fetchurl stdenv; + inherit fetchurl stdenv libsndfile fftw pkgconfig; }; libspectre = import ../development/libraries/libspectre { _______________________________________________ nix-commits mailing list nix-comm...@cs.uu.nl http://mail.cs.uu.nl/mailman/listinfo/nix-commits