diff --git a/pkgs/applications/networking/browsers/midori/default.nix b/pkgs/applications/networking/browsers/midori/default.nix index 6e637aec8465..1f4d224e4353 100644 --- a/pkgs/applications/networking/browsers/midori/default.nix +++ b/pkgs/applications/networking/browsers/midori/default.nix @@ -5,19 +5,19 @@ let doPatchShebangs = args.doPatchShebangs; makeManyWrappers = args.makeManyWrappers; - version = lib.attrByPath ["version"] "0.1.7" args; + version = "0.2"; + release = "7"; buildInputs = with args; [ intltool python imagemagick gtk glib webkit libxml2 gtksourceview pkgconfig which gettext makeWrapper - file libidn sqlite docutils libnotify libsoup + file libidn sqlite docutils libnotify libsoup vala + kbproto xproto scrnsaverproto libXScrnSaver dbus_glib ]; in rec { src = fetchurl { - url = "http://goodies.xfce.org/releases/midori/midori-${version}.tar.bz2"; - sha256 = if version == "0.1.7" then - "1bxs4nlwvhzwiq73lf1gvx7qqdm1hm4x1hym1b0q0dhwhdvafx4v" - else null; + url = "http://archive.xfce.org/src/apps/midori/${version}/midori-${version}.${release}.tar.bz2"; + sha256 = "b1dcc479ceb938c8d9cdea098c8d72d563bce5010c27fbcaa4c992d10f2d809c"; }; inherit buildInputs; @@ -32,7 +32,7 @@ rec { shebangsInstalled = (doPatchShebangs "$out/bin"); wrapWK = (makeManyWrappers "$out/bin/*" "--set WEBKIT_IGNORE_SSL_ERRORS 1"); - name = "midori-" + version; + name = "midori-${version}.${release}"; meta = { description = "Light WebKit-based web browser with GTK GUI."; maintainers = [args.lib.maintainers.raskin]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6926d98624e1..333b03737227 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5815,10 +5815,12 @@ let midori = builderDefsPackage (import ../applications/networking/browsers/midori) { inherit imagemagick intltool python pkgconfig webkit libxml2 - which gettext makeWrapper file libidn sqlite docutils libnotify; + which gettext makeWrapper file libidn sqlite docutils libnotify + vala dbus_glib; inherit (gtkLibs) gtk glib; inherit (gnome28) gtksourceview; inherit (webkit.passthru.args) libsoup; + inherit (xlibs) kbproto xproto libXScrnSaver scrnsaverproto; }; minicom = callPackage ../tools/misc/minicom { };