diff options
author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-03-22 09:54:10 +0200 |
---|---|---|
committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-03-22 09:54:10 +0200 |
commit | 809b0d26bd34fcf13a35025dacf731c0a3d13292 (patch) | |
tree | 96bf2739244a52d15556e1207bdfaf93d6353bee /pkgs/applications/networking/browsers/eolie/default.nix | |
parent | c9d3fc7cad4d243025f9a0e1b3eec9305863c06d (diff) | |
parent | f7397f21ab841955eb277919f19035cbc336e88b (diff) | |
download | nixlib-809b0d26bd34fcf13a35025dacf731c0a3d13292.tar nixlib-809b0d26bd34fcf13a35025dacf731c0a3d13292.tar.gz nixlib-809b0d26bd34fcf13a35025dacf731c0a3d13292.tar.bz2 nixlib-809b0d26bd34fcf13a35025dacf731c0a3d13292.tar.lz nixlib-809b0d26bd34fcf13a35025dacf731c0a3d13292.tar.xz nixlib-809b0d26bd34fcf13a35025dacf731c0a3d13292.tar.zst nixlib-809b0d26bd34fcf13a35025dacf731c0a3d13292.zip |
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'pkgs/applications/networking/browsers/eolie/default.nix')
-rw-r--r-- | pkgs/applications/networking/browsers/eolie/default.nix | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/pkgs/applications/networking/browsers/eolie/default.nix b/pkgs/applications/networking/browsers/eolie/default.nix index d1741774d347..9d4c858298d6 100644 --- a/pkgs/applications/networking/browsers/eolie/default.nix +++ b/pkgs/applications/networking/browsers/eolie/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, intltool, itstool, meson, ninja, pkgconfig, wrapGAppsHook -, git, glib, glib-networking, gsettings-desktop-schemas, gst_all_1, gtk3 +, glib, glib-networking, gsettings-desktop-schemas, gst_all_1, gtk3, gobjectIntrospection , gtkspell3, libsecret, python36, python36Packages, webkitgtk }: stdenv.mkDerivation rec { @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "0.9.16"; src = fetchgit { - url = "https://gitlab.gnome.org/gnumdk/eolie"; + url = https://gitlab.gnome.org/gnumdk/eolie; rev = version; sha256 = "0mvhr6hy4nx7xaq9r9qp5rb0y293kjjryw5ykzb473cr3iwzk25b"; }; @@ -19,10 +19,11 @@ stdenv.mkDerivation rec { ninja pkgconfig wrapGAppsHook + gobjectIntrospection ]; buildInputs = [ - git # required to download ad blocking DB + glib glib-networking gsettings-desktop-schemas gst_all_1.gstreamer @@ -47,20 +48,18 @@ stdenv.mkDerivation rec { wrapPrefixVariables = [ "PYTHONPATH" ]; - enableParallelBuilding = true; - - postInstall = '' - ${glib.dev}/bin/glib-compile-schemas $out/share/glib-2.0/schemas + postPatch = '' + chmod +x meson_post_install.py # patchShebangs requires executable file + patchShebangs meson_post_install.py ''; patches = [ - ./0001-Remove-post-install-script-handle-in-nix-config-inst.patch ./0001-Extend-the-python-path-rather-than-replacing-it.patch ]; meta = with stdenv.lib; { description = "A new GNOME web browser"; - homepage = https://gitlab.gnome.org/gnumdk/eolie; + homepage = https://wiki.gnome.org/Apps/Eolie; license = licenses.gpl3; maintainers = [ maintainers.samdroid-apps ]; platforms = platforms.linux; |