From 00ffbf060c7c11c11d755ea2e4815bfc5e58d464 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Fri, 3 Mar 2017 18:25:00 +0100 Subject: [PATCH] guitarix: remove webkit, add compile flags as recomended by the author: https://sourceforge.net/p/guitarix/mailman/message/33688855/ --- pkgs/applications/audio/guitarix/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix index a5e29a5e1747..642cbbd23f62 100644 --- a/pkgs/applications/audio/guitarix/default.nix +++ b/pkgs/applications/audio/guitarix/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, gettext, intltool, pkgconfig, python2 , avahi, bluez, boost, eigen, fftw, glib, glib_networking , glibmm, gsettings_desktop_schemas, gtkmm2, libjack2 -, ladspaH, librdf, libsndfile, lilv, lv2, serd, sord, sratom -, webkitgtk2, wrapGAppsHook, zita-convolver, zita-resampler +, ladspaH, libav, librdf, libsndfile, lilv, lv2, serd, sord, sratom +, wrapGAppsHook, zita-convolver, zita-resampler , optimizationSupport ? false # Enable support for native CPU extensions }: @@ -23,8 +23,8 @@ stdenv.mkDerivation rec { buildInputs = [ avahi bluez boost eigen fftw glib glibmm glib_networking.out - gsettings_desktop_schemas gtkmm2 libjack2 ladspaH librdf - libsndfile lilv lv2 serd sord sratom webkitgtk2 zita-convolver + gsettings_desktop_schemas gtkmm2 libjack2 ladspaH libav librdf + libsndfile lilv lv2 serd sord sratom zita-convolver zita-resampler ]; @@ -33,6 +33,9 @@ stdenv.mkDerivation rec { "--no-desktop-update" "--enable-nls" "--no-faust" # todo: find out why --faust doesn't work + "--install-roboto-font" + "--includeresampler" + "--convolver-ffmpeg" ] ++ optional optimizationSupport "--optimization"; configurePhase = ''python2 waf configure --prefix=$out $configureFlags'';