From 859ec9719b17654c29df2074832794f8e3076247 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Wed, 6 May 2015 02:08:11 +0200 Subject: [PATCH] guitarix: use system zita libs --- pkgs/applications/audio/guitarix/default.nix | 6 ++-- .../audio/zita-resampler/default.nix | 33 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 38 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/libraries/audio/zita-resampler/default.nix diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix index 984d666ab95..9c1859cacf4 100644 --- a/pkgs/applications/audio/guitarix/default.nix +++ b/pkgs/applications/audio/guitarix/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchurl, gettext, intltool, pkgconfig, python , avahi, bluez, boost, eigen, fftw, glib, glibmm, gtk, gtkmm, jack2 , ladspaH, librdf, libsndfile, lilv, lv2, serd, sord, sratom +, zita-convolver, zita-resampler , optimizationSupport ? false # Enable support for native CPU extensions }: @@ -22,15 +23,14 @@ stdenv.mkDerivation rec { buildInputs = [ avahi bluez boost eigen fftw glib glibmm gtk gtkmm jack2 ladspaH librdf libsndfile lilv lv2 serd sord sratom + zita-convolver zita-resampler ]; configureFlags = [ "--shared-lib" "--no-desktop-update" - "--no-faust" # Need to package a release of faust, 0.9.58 or 0.9.65 "--enable-nls" - "--includeresampler" # Zita-resampler not packaged, use vendored version - "--includeconvolver" # Zita-convolver not packaged, use vendored version + "--no-faust" # todo: find out why --faust doesn't work ] ++ optional optimizationSupport "--optimization"; configurePhase = ''python waf configure --prefix=$out $configureFlags''; diff --git a/pkgs/development/libraries/audio/zita-resampler/default.nix b/pkgs/development/libraries/audio/zita-resampler/default.nix new file mode 100644 index 00000000000..8c7e82557ab --- /dev/null +++ b/pkgs/development/libraries/audio/zita-resampler/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "zita-resampler-${version}"; + version = "1.3.0"; + src = fetchurl { + url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2"; + sha256 = "0r9ary5sc3y8vba5pad581ha7mgsrlyai83w7w4x2fmhfy64q0wq"; + }; + + makeFlags = [ + "PREFIX=$(out)" + "SUFFIX=" + ]; + + patchPhase = '' + cd libs + sed -e "s@ldconfig@@" -i Makefile + ''; + + fixupPhase = '' + ln -s $out/lib/libzita-resampler.so.$version $out/lib/libzita-resampler.so.1 + ''; + + meta = { + description = "resample library by Fons Adriaensen"; + version = "${version}"; + homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html"; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.magnetophon ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6c675ec1523..65773332d05 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8240,6 +8240,8 @@ let zita-alsa-pcmi = callPackage ../development/libraries/audio/zita-alsa-pcmi { }; + zita-resampler = callPackage ../development/libraries/audio/zita-resampler { }; + zziplib = callPackage ../development/libraries/zziplib { }; ### DEVELOPMENT / LIBRARIES / AGDA