webkitgtk: add gtk2 version

This commit is contained in:
宋文武 2014-03-27 16:11:56 +08:00
parent 699b18e95a
commit 2cf7678fc0
2 changed files with 16 additions and 3 deletions

View File

@ -3,6 +3,8 @@
, gtk2, gtk3, wayland, libwebp, enchant
, libxml2, libsoup, libsecret, libxslt, harfbuzz
, gst-plugins-base
, withGtk2 ? false
, enableIntrospection ? true
}:
stdenv.mkDerivation rec {
@ -31,9 +33,12 @@ stdenv.mkDerivation rec {
done
'';
configureFlags = [
configureFlags = with stdenv.lib; [
"--disable-geolocation"
"--enable-introspection"
(optionalString enableIntrospection "--enable-introspection")
] ++ stdenv.lib.optional withGtk2 [
"--with-gtk=2.0"
"--disable-webkit2"
];
dontAddDisableDepTrack = true;
@ -49,7 +54,10 @@ stdenv.mkDerivation rec {
gst-plugins-base
];
propagatedBuildInputs = [ gtk3 libsoup ];
propagatedBuildInputs = [
libsoup
(if withGtk2 then gtk2 else gtk3)
];
#enableParallelBuilding = true; # build problems on Hydra
}

View File

@ -5909,6 +5909,11 @@ let
gst-plugins-base = gst_all_1.gst-plugins-base;
};
webkitgtk2 = webkitgtk.override {
withGtk2 = true;
enableIntrospection = false;
};
wildmidi = callPackage ../development/libraries/wildmidi { };
wvstreams = callPackage ../development/libraries/wvstreams { };