eolie: 0.9.63 -> 0.9.99, fix build

This commit is contained in:
Jonathan Ringer 2020-08-15 23:15:11 -07:00 committed by Jon
parent a4672f78d5
commit 43fc3a03a2

View File

@ -1,11 +1,11 @@
{ stdenv, fetchgit, meson, ninja, pkgconfig, nix-update-script { stdenv, fetchgit, meson, ninja, pkgconfig, nix-update-script
, python3, gtk3, libsecret, gst_all_1, webkitgtk , python3, gtk3, libsecret, gst_all_1, webkitgtk, glib
, glib-networking, gtkspell3, hunspell, desktop-file-utils , glib-networking, gtkspell3, hunspell, desktop-file-utils
, gobject-introspection, wrapGAppsHook }: , gobject-introspection, wrapGAppsHook, gnome3 }:
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "eolie"; pname = "eolie";
version = "0.9.63"; version = "0.9.99";
format = "other"; format = "other";
doCheck = false; doCheck = false;
@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec {
url = "https://gitlab.gnome.org/World/eolie"; url = "https://gitlab.gnome.org/World/eolie";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
fetchSubmodules = true; fetchSubmodules = true;
sha256 = "0z8gcfg7i842rr5p8r3vqa31kf7nnj1yv3afax3jzf4zbnhb8wm0"; sha256 = "077jww5mqg6bbqbj0j1gss2j3dxlfr2xw8bc43k8vg52drqg6g8w";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -33,18 +33,23 @@ python3.pkgs.buildPythonApplication rec {
gst-plugins-base gst-plugins-base
gst-plugins-ugly gst-plugins-ugly
gstreamer gstreamer
gnome3.gnome-settings-daemon
gtk3 gtk3
gtkspell3 gtkspell3
hunspell hunspell
libsecret libsecret
webkitgtk webkitgtk
glib
]; ];
propagatedBuildInputs = with python3.pkgs; [ propagatedBuildInputs = with python3.pkgs; [
pyfxa
beautifulsoup4 beautifulsoup4
cryptography
pycairo pycairo
pygobject3 pygobject3
python-dateutil python-dateutil
pycrypto
]; ];
postPatch = '' postPatch = ''
@ -52,9 +57,11 @@ python3.pkgs.buildPythonApplication rec {
patchShebangs meson_post_install.py patchShebangs meson_post_install.py
''; '';
dontWrapGApps = true;
preFixup = '' preFixup = ''
buildPythonPath "$out $propagatedBuildInputs" buildPythonPath "$out $propagatedBuildInputs"
patchPythonScript "$out/libexec/eolie-sp" patchPythonScript "$out/libexec/eolie-sp"
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
''; '';
passthru = { passthru = {
@ -63,6 +70,7 @@ python3.pkgs.buildPythonApplication rec {
}; };
}; };
strictDeps = false;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A new GNOME web browser"; description = "A new GNOME web browser";