diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2019-09-21 17:45:51 -0400 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-10-03 00:09:13 +0200 |
| commit | 1252132f080e6c0d8246b9d511cebb55e5642e20 (patch) | |
| tree | cd7f6dfadb843b803dee71e6441b2ec1837e2f3c /pkgs | |
| parent | 7ba3608aa0c591c7216f22311a35337dd9a7aff8 (diff) | |
| download | nixpkgs-1252132f080e6c0d8246b9d511cebb55e5642e20.tar nixpkgs-1252132f080e6c0d8246b9d511cebb55e5642e20.tar.gz nixpkgs-1252132f080e6c0d8246b9d511cebb55e5642e20.tar.bz2 nixpkgs-1252132f080e6c0d8246b9d511cebb55e5642e20.tar.lz nixpkgs-1252132f080e6c0d8246b9d511cebb55e5642e20.tar.xz nixpkgs-1252132f080e6c0d8246b9d511cebb55e5642e20.tar.zst nixpkgs-1252132f080e6c0d8246b9d511cebb55e5642e20.zip | |
midori: 7 -> 9.0
* add libarchive and json-glib We use vala_0_44 to avoid the issue with sqlite3 vapi [0] [0]: https://gitlab.gnome.org/GNOME/vala/commit/a54e4d89a449044c965869abf0ce78dadcf093ac.patch
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/networking/browsers/midori/default.nix | 44 |
1 files changed, 36 insertions, 8 deletions
diff --git a/pkgs/applications/networking/browsers/midori/default.nix b/pkgs/applications/networking/browsers/midori/default.nix index a0bc0c743e4..f87ba43f2bb 100644 --- a/pkgs/applications/networking/browsers/midori/default.nix +++ b/pkgs/applications/networking/browsers/midori/default.nix @@ -1,24 +1,52 @@ -{ stdenv, fetchurl, cmake, ninja, pkgconfig, intltool, vala, wrapGAppsHook, gcr, libpeas -, gtk3, webkitgtk, sqlite, gsettings-desktop-schemas, libsoup, glib-networking +{ stdenv +, fetchurl +, cmake +, ninja +, pkgconfig +, intltool +, vala_0_44 +, wrapGAppsHook +, gcr +, libpeas +, gtk3 +, webkitgtk +, sqlite +, gsettings-desktop-schemas +, libsoup +, glib-networking +, json-glib +, libarchive }: stdenv.mkDerivation rec { pname = "midori"; - version = "7"; + version = "9.0"; src = fetchurl { - url = "https://github.com/midori-browser/core/releases/download/v${version}/midori-v${version}.0.tar.gz"; - sha256 = "0ffdnjp55s0ci737vlhxikb2nihghwlb6mjcjzpgpnzi47vjqnwh"; + url = "https://github.com/midori-browser/core/releases/download/v${version}/midori-v${version}.tar.gz"; + sha256 = "05i04qa83dnarmgkx4xsk6fga5lw1lmslh4rb3vhyyy4ala562jy"; }; nativeBuildInputs = [ - pkgconfig cmake ninja intltool vala wrapGAppsHook + cmake + intltool + ninja + pkgconfig + vala_0_44 + wrapGAppsHook ]; buildInputs = [ - gtk3 webkitgtk sqlite gsettings-desktop-schemas gcr - (libsoup.override { gnomeSupport = true; }) libpeas + (libsoup.override { gnomeSupport = true; }) + gcr glib-networking + gsettings-desktop-schemas + gtk3 + libpeas + sqlite + webkitgtk + json-glib + libarchive ]; meta = with stdenv.lib; { |