From 99f198ab9f6523d633dc057a87f48383efdf3f4e Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 25 Mar 2012 11:22:32 +0000
Subject: [PATCH] Update/fix Midori

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33400
---
 .../networking/browsers/midori/default.nix       | 16 ++++++++++------
 pkgs/top-level/all-packages.nix                  |  2 +-
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/networking/browsers/midori/default.nix b/pkgs/applications/networking/browsers/midori/default.nix
index 1f4d224e435..b15c05c7b49 100644
--- a/pkgs/applications/networking/browsers/midori/default.nix
+++ b/pkgs/applications/networking/browsers/midori/default.nix
@@ -5,10 +5,10 @@ let
   doPatchShebangs = args.doPatchShebangs;
   makeManyWrappers = args.makeManyWrappers;
 
-  version = "0.2"; 
-  release = "7";
+  version = "0.4"; 
+  release = "4";
   buildInputs = with args; [
-    intltool python imagemagick gtk glib webkit libxml2 
+    intltool python imagemagick gtk3 glib webkit libxml2 
     gtksourceview pkgconfig which gettext makeWrapper 
     file libidn sqlite docutils libnotify libsoup vala
     kbproto xproto scrnsaverproto libXScrnSaver dbus_glib
@@ -17,16 +17,20 @@ in
 rec {
   src = fetchurl {
     url = "http://archive.xfce.org/src/apps/midori/${version}/midori-${version}.${release}.tar.bz2";
-    sha256 = "b1dcc479ceb938c8d9cdea098c8d72d563bce5010c27fbcaa4c992d10f2d809c";
+    sha256 = "fadd43f76c1c9f6a16483e60a804e58fb6817c6a595b1acdd59bcbdd7b35bca2";
   };
 
   inherit buildInputs;
-  configureFlags = [];
+  configureFlags = ["--enable-gtk3"];
 
   /* doConfigure should be specified separately */
-  phaseNames = ["doUnpack" "shebangsHere" "doConfigure" 
+  phaseNames = ["doUnpack" "setVars" "shebangsHere" "doConfigure" 
     "doMakeInstall" "shebangsInstalled" "wrapWK"
     ];
+
+  setVars = args.fullDepEntry ''
+    export NIX_LDFLAGS="$NIX_LDFLAGS -lnotify"
+  '' [];
       
   shebangsHere = (doPatchShebangs ".");
   shebangsInstalled = (doPatchShebangs "$out/bin");
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 212f664e888..b9f8790a8a0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6991,7 +6991,7 @@ let
     inherit imagemagick intltool python pkgconfig webkit libxml2
       which gettext makeWrapper file libidn sqlite docutils libnotify
       vala dbus_glib;
-    inherit gtk glib;
+    inherit gtk3 glib;
     inherit (gnome) gtksourceview;
     inherit (webkit.passthru.args) libsoup;
     inherit (xlibs) kbproto xproto libXScrnSaver scrnsaverproto;