Porting a fix from nixpkgs trunk - vimprobable2 now builds (against obsolete WebKit/GTK2)

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33467

pkgs/applications/networking/browsers/vimprobable2/default.nix

@@ -1,4 +1,4 @@
-{stdenv, fetchurl, makeWrapper, perl, pkgconfig, webkit, gtk, libX11, libsoup,
+{stdenv, fetchurl, makeWrapper, perl, pkgconfig, webkit_gtk2, gtk, libX11, libsoup,
 glib_networking}:
 
 stdenv.mkDerivation {
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
     url = "mirror://sourceforge/vimprobable/vimprobable2_0.9.12.0.tar.bz2";
     sha256 = "1b6xs6rd4rxy9kdsva13bbx7pd2gy159ad8ncd4pplsqr46hw8fb";
   };
-  buildInputs = [ makeWrapper perl pkgconfig libX11 libsoup webkit gtk ];
+  buildInputs = [ makeWrapper perl pkgconfig libX11 libsoup webkit_gtk2 gtk ];
   installPhase = ''
     make PREFIX=/ DESTDIR=$out install
     wrapProgram "$out/bin/vimprobable2" --prefix GIO_EXTRA_MODULES : \

pkgs/development/libraries/webkit/gtk2.nix

@@ -0,0 +1,91 @@
+
+args : with args; 
+let 
+  s = import ./src-for-gtk2.nix;
+  version = lib.attrByPath ["version"] s.version args;
+in
+rec {
+  src = fetchurl {
+    url = s.url;
+    sha256 = s.hash;
+  };
+
+  buildInputs = [gtk glib atk cairo curl fontconfig freetype
+    gettext libjpeg libpng libtiff libxml2 libxslt pango
+    sqlite icu gperf bison flex autoconf automake libtool 
+    perl intltool pkgconfig libsoup gtkdoc libXt libproxy
+    enchant python ruby which renderproto libXrender geoclue
+    ];
+
+  propagatedBuildInputs = [
+    gstreamer gst_plugins_base gst_ffmpeg gst_plugins_good
+    ];
+
+  configureFlags = [
+    "--enable-3D-transforms"
+    "--enable-web-sockets"
+    "--enable-web-timing"
+    
+    # https://bugs.webkit.org/show_bug.cgi?id=55294
+    # "--enable-image-resizer"
+
+    "--enable-geolocation"
+
+    # Not implemented?
+    # "--enable-web-audio"
+
+    "--enable-mathml"
+
+    #"--enable-wml"
+    
+    # https://bugs.webkit.org/show_bug.cgi?id=45110
+    # "--enable-indexed-database"
+
+    "--enable-xhtmlmp"
+
+    # "--enable-input-speech"
+
+    "--enable-file-writer"
+    "--enable-blob"
+
+    # https://bugs.webkit.org/show_bug.cgi?id=59430
+    # "--enable-directory-upload"
+
+    # https://bugs.webkit.org/show_bug.cgi?id=58443
+    # "--enable-file-system"
+    ];
+
+  /* doConfigure should be specified separately */
+  phaseNames = ["setVars" /* "paranoidFixComments" */ "doConfigure" (doPatchShebangs ".") 
+    "doReplaceUsrBin" "doMakeInstall" "doAddPrograms"];
+
+  setVars = fullDepEntry (''
+    export NIX_LDFLAGS="$NIX_LDFLAGS -lXt"
+  '') ["minInit"];
+
+  doReplaceUsrBin = fullDepEntry (''
+    for i in $(find . -name '*.pl') $(find . -name '*.pm'); do 
+        sed -e 's@/usr/bin/gcc@gcc@' -i $i
+    done
+  '') ["minInit" "doUnpack"];
+
+  doAddPrograms = fullDepEntry (''
+    mkdir -p $out/bin
+    for i in Programs/.libs/* Programs/*; do 
+        cp $i $out/bin/webkit-program-$(basename $i) || true
+    done
+  '') ["minInit" "doMake" "defEnsureDir"];
+      
+  paranoidFixComments = fullDepEntry (''
+    sed -re 's@( |^)//.*@/* & */@' -i $(find . -name '*.c' -o -name '*.h')
+  '') ["minInit" "doUnpack"];
+
+  name = s.name;
+  meta = {
+    description = "WebKit - a fast and correct HTML renderer";
+    maintainers = [stdenv.lib.maintainers.raskin];
+  };
+  passthru = {
+    inherit gstreamer gst_plugins_base gst_plugins_good gst_ffmpeg;
+  };
+}

pkgs/development/libraries/webkit/src-for-gtk2.nix

@@ -0,0 +1,9 @@
+rec {
+   version="1.4.0";
+   name="webkit-1.4.0";
+   hash="123zllzlnkjgw4d2ag73dvrjmkikbapxlz5730ps6y4qm43gxc1y";
+   url="http://webkitgtk.org/webkit-1.4.0.tar.gz";
+   advertisedUrl="http://webkitgtk.org/webkit-1.4.0.tar.gz";
+  
+  
+}

pkgs/top-level/all-packages.nix

@@ -4783,6 +4783,22 @@ let
       perl = perl510;
     };
 
+  webkit_gtk2 = 
+    builderDefsPackage ../development/libraries/webkit/gtk2.nix {
+      inherit (gnome) gtkdoc libsoup;
+      inherit gtk atk pango glib;
+      inherit freetype fontconfig gettext gperf curl
+        libjpeg libtiff libxml2 libxslt sqlite
+        icu cairo intltool automake libtool
+        pkgconfig autoconf bison libproxy enchant
+        python ruby which flex geoclue;
+      inherit gstreamer gst_plugins_base gst_ffmpeg
+        gst_plugins_good;
+      inherit (xlibs) libXt renderproto libXrender;
+      libpng = libpng12;
+      perl = perl510;
+    };
+
   webkitSVN =
     builderDefsPackage ../development/libraries/webkit/svn.nix {
       inherit (gnome) gtkdoc libsoup;