From fb3853cd71b5229925ce69f4d7e9b42f6234ff25 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Fri, 3 Mar 2017 17:20:32 +0100 Subject: [PATCH] Revert "guitarix: webkitgtk2 -> webkitgtk (#23390)" This reverts commit 0e2a8cd01c1d3af49b0f42569a2974173be5ff76. Per https://github.com/NixOS/nixpkgs/pull/23390#issuecomment-283994426 guitarix only works with webkit1; replacing it with webkit2 then is equivalent to removing it outright. --- pkgs/applications/audio/guitarix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix index 2ed59124ee2e..a5e29a5e1747 100644 --- a/pkgs/applications/audio/guitarix/default.nix +++ b/pkgs/applications/audio/guitarix/default.nix @@ -2,7 +2,7 @@ , avahi, bluez, boost, eigen, fftw, glib, glib_networking , glibmm, gsettings_desktop_schemas, gtkmm2, libjack2 , ladspaH, librdf, libsndfile, lilv, lv2, serd, sord, sratom -, webkitgtk, wrapGAppsHook, zita-convolver, zita-resampler +, webkitgtk2, wrapGAppsHook, zita-convolver, zita-resampler , optimizationSupport ? false # Enable support for native CPU extensions }: @@ -24,7 +24,7 @@ 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 webkitgtk zita-convolver + libsndfile lilv lv2 serd sord sratom webkitgtk2 zita-convolver zita-resampler ];