midori: 0.5.8 -> 0.5.11 (#17142)

1 files changed, 15 insertions, 15 deletions

diff --git a/pkgs/applications/networking/browsers/midori/default.nix b/pkgs/applications/networking/browsers/midori/default.nix
index 23ed0bc2c1ea0..476137581cc81 100644
--- a/pkgs/applications/networking/browsers/midori/default.nix
+++ b/pkgs/applications/networking/browsers/midori/default.nix
@@ -1,20 +1,20 @@
 { stdenv, fetchurl, cmake, pkgconfig, intltool, vala, makeWrapper
 , gtk3, webkitgtk, librsvg, libnotify, sqlite
-, glib_networking, gsettings_desktop_schemas, libsoup
+, glib_networking, gsettings_desktop_schemas, libsoup, pcre, gnome3
 }:
 
 let
-  version = "0.5.8";
+  version = "0.5.11";
 in
 stdenv.mkDerivation rec {
   name = "midori-${version}";
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Lightweight WebKitGTK+ web browser";
     homepage = "http://midori-browser.org";
-    license = stdenv.lib.licenses.lgpl21Plus;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ raskin ];
+    license = licenses.lgpl21Plus;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ raskin ramkromberg ];
   };
 
   src = fetchurl {
@@ -23,21 +23,21 @@ stdenv.mkDerivation rec {
       "http://mirrors-ru.go-parts.com/blfs/conglomeration/midori/midori_${version}_all_.tar.bz2"
     ];
     name = "midori_${version}_all_.tar.bz2";
-    sha256 = "10ckm98rfqfbwr84b8mc1ssgj84wjgkr4dadvx2l7c64sigi66dg";
+    sha256 = "0gcwqkcyliqz10i33ww3wl02mmfnl7jzl2d493l4l53ipsb1l6cn";
   };
 
-  sourceRoot = ".";
-
   buildInputs = [
     cmake pkgconfig intltool vala makeWrapper
-    webkitgtk librsvg libnotify sqlite gsettings_desktop_schemas
-    (libsoup.override {gnomeSupport = true;})
+    webkitgtk librsvg libnotify sqlite gsettings_desktop_schemas pcre gnome3.gcr
+    (libsoup.override {gnomeSupport = true; valaSupport = true;})
   ];
 
-  cmakeFlags = ''
-    -DHALF_BRO_INCOM_WEBKIT2=ON
-    -DUSE_ZEITGEIST=OFF
-  '';
+  cmakeFlags = [ 
+    "-DCMAKE_BUILD_TYPE=Release"
+    "-DUSE_ZEITGEIST=OFF"
+    "-DHALF_BRO_INCOM_WEBKIT2=OFF"
+    "-DUSE_GTK3=1"
+  ];
 
   NIX_LDFLAGS="-lX11";