mailnag: fix working (#30358)

* mailnag: fix working

* mailnag: use wrapGAppsHook; add icon theme
This commit is contained in:
gnidorah 2017-10-14 14:07:44 +03:00 committed by Jörg Thalheim
parent 60a7a4db83
commit 27bcd6c426
2 changed files with 20 additions and 21 deletions

View File

@ -1,9 +1,12 @@
{ stdenv, fetchurl, gettext, gtk3, python2Packages { stdenv, fetchurl, gettext, gtk3, pythonPackages
, gdk_pixbuf, libnotify, gst_all_1 , gdk_pixbuf, libnotify, gst_all_1
, libgnome_keyring3 ? null, networkmanager ? null , libgnome_keyring3, networkmanager
, wrapGAppsHook, gnome3
, withGnomeKeyring ? false
, withNetworkManager ? true
}: }:
python2Packages.buildPythonApplication rec { pythonPackages.buildPythonApplication rec {
name = "mailnag-${version}"; name = "mailnag-${version}";
version = "1.2.1"; version = "1.2.1";
@ -13,26 +16,20 @@ python2Packages.buildPythonApplication rec {
}; };
buildInputs = [ buildInputs = [
gettext gtk3 python2Packages.pygobject3 python2Packages.dbus-python gettext gtk3 gdk_pixbuf libnotify gst_all_1.gstreamer
python2Packages.pyxdg gdk_pixbuf libnotify gst_all_1.gstreamer
gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
gst_all_1.gst-plugins-bad libgnome_keyring3 networkmanager gst_all_1.gst-plugins-bad
gnome3.defaultIconTheme
] ++ stdenv.lib.optional withGnomeKeyring libgnome_keyring3
++ stdenv.lib.optional withNetworkManager networkmanager;
nativeBuildInputs = [
wrapGAppsHook
]; ];
preFixup = '' propagatedBuildInputs = with pythonPackages; [
for script in mailnag mailnag-config; do pygobject3 dbus-python pyxdg
wrapProgram $out/bin/$script \ ];
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share" \
--prefix PYTHONPATH : "$PYTHONPATH"
done
'';
buildPhase = "";
installPhase = "python2 setup.py install --prefix=$out";
doCheck = false; doCheck = false;

View File

@ -3218,7 +3218,9 @@ with pkgs;
mailhog = callPackage ../servers/mail/mailhog {}; mailhog = callPackage ../servers/mail/mailhog {};
mailnag = callPackage ../applications/networking/mailreaders/mailnag { }; mailnag = callPackage ../applications/networking/mailreaders/mailnag {
pythonPackages = python2Packages;
};
mailsend = callPackage ../tools/networking/mailsend { }; mailsend = callPackage ../tools/networking/mailsend { };