From 3493b7cacfe330c7c218eb8d95a5fb3e0258b991 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Mon, 16 Dec 2013 14:38:38 +0100 Subject: [PATCH] webkit: pin to bison 2.7 --- pkgs/top-level/all-packages.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 42957a9db366..72c9c41dcfd8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5866,20 +5866,22 @@ let inherit gtk2; # for plugins etc. even with gtk3, see Gentoo ebuild inherit gtk3 glib atk cairo pango fontconfig freetype; inherit (gnome) gtkdoc libsoup; - inherit pkgconfig libtool intltool autoconf automake gperf bison flex + inherit pkgconfig libtool intltool autoconf automake gperf flex libjpeg libpng libtiff libxml2 libxslt sqlite icu curl which libproxy geoclue enchant python ruby perl mesa xlibs; inherit gstreamer gst_plugins_base gst_ffmpeg gst_plugins_good; + bison = bison2; }; webkit_gtk2 = builderDefsPackage ../development/libraries/webkit/gtk2.nix { inherit gtk2 glib atk cairo pango fontconfig freetype; inherit (gnome) gtkdoc libsoup; - inherit pkgconfig libtool intltool autoconf automake gperf bison flex + inherit pkgconfig libtool intltool autoconf automake gperf flex libjpeg libpng libtiff libxml2 libxslt sqlite icu curl which libproxy geoclue enchant python ruby perl mesa xlibs; inherit gstreamer gst_plugins_base gst_ffmpeg gst_plugins_good; + bison = bison2; }; wildmidi = callPackage ../development/libraries/wildmidi { };