Merge pull request #46560 from worldofpeace/eolie/0.9.36

eolie: 0.9.35 -> 0.9.36
This commit is contained in:
Jörg Thalheim 2018-09-12 21:29:52 +01:00 committed by GitHub
commit ca2395fc2f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,45 +1,53 @@
{ stdenv, fetchgit, meson, ninja, pkgconfig, wrapGAppsHook { stdenv, fetchgit, meson, ninja, pkgconfig
, desktop-file-utils, gobjectIntrospection, python36Packages , python3, gtk3, libsecret, gst_all_1, webkitgtk
, gnome3, gst_all_1, gtkspell3, hunspell }: , glib-networking, gtkspell3, hunspell, desktop-file-utils
, gobjectIntrospection, wrapGAppsHook }:
stdenv.mkDerivation rec { python3.pkgs.buildPythonApplication rec {
name = "eolie-${version}"; name = "eolie-${version}";
version = "0.9.35"; version = "0.9.36";
format = "other";
doCheck = false;
src = fetchgit { src = fetchgit {
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 = "0x3p1fgx1fhrnr7vkkpnl34401r6k6xg2mrjff7ncb1k57q522k7"; sha256 = "1pqs6lddkj7nvxdwf0yncwdcr7683mpvx3912vn7b1f2q2zkp1fv";
}; };
nativeBuildInputs = with python36Packages; [ nativeBuildInputs = [
desktop-file-utils desktop-file-utils
gobjectIntrospection gobjectIntrospection
meson meson
ninja ninja
pkgconfig pkgconfig
wrapGAppsHook wrapGAppsHook
wrapPython
]; ];
buildInputs = [ gtkspell3 hunspell python36Packages.pygobject3 ] ++ (with gnome3; [ buildInputs = with gst_all_1; [
glib glib-networking gsettings-desktop-schemas gtk3 webkitgtk libsecret glib-networking
]) ++ (with gst_all_1; [ gst-libav
gst-libav gst-plugins-base gst-plugins-ugly gstreamer gst-plugins-base
]); gst-plugins-ugly
gstreamer
gtk3
gtkspell3
hunspell
libsecret
webkitgtk
];
pythonPath = with python36Packages; [ pythonPath = with python3.pkgs; [
beautifulsoup4 beautifulsoup4
pycairo pycairo
pygobject3 pygobject3
python-dateutil python-dateutil
]; ];
postFixup = "wrapPythonPrograms";
postPatch = '' postPatch = ''
chmod +x meson_post_install.py # patchShebangs requires executable file chmod +x meson_post_install.py
patchShebangs meson_post_install.py patchShebangs meson_post_install.py
''; '';